Merge "Update paths for frameworks/base/config" am: e984c78faf

am: e3196ada4c

Change-Id: I75c6489adc15dcb819e1a8034f0764cdc49019d3
This commit is contained in:
Mathieu Chartier 2017-09-29 08:21:21 +00:00 committed by android-build-merger
commit 2cbb80d5b4
2 changed files with 4 additions and 4 deletions

View file

@ -153,16 +153,16 @@ PRODUCT_PACKAGES_DEBUG := \
sqlite3
PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
frameworks/base/preloaded-classes:system/etc/preloaded-classes)
frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)
# Note: it is acceptable to not have a compiled-classes file. In that case, all boot classpath
# classes will be compiled.
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/compiled-classes:system/etc/compiled-classes)
frameworks/base/config/compiled-classes:system/etc/compiled-classes)
# Note: it is acceptable to not have a dirty-image-objects file. In that case, the special bin
# for known dirty objects in the image will be empty.
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/dirty-image-objects:system/etc/dirty-image-objects)
frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
$(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk)

View file

@ -148,7 +148,7 @@ PRODUCT_COPY_FILES += \
# Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/compiled-classes-phone:system/etc/compiled-classes)
frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes)
# Enable dirty image object binning to reduce dirty pages in the image.
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\