Update paths for frameworks/base/config
Bug: 64259751
Test: make
(cherry picked from commit 37ba2d97df409a18d0bb0968df53f507788a8403)
Change-Id: Iac1f92d1e4126d088b691c46a0b858e9e9bfb1a4
Merged-In: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
diff --git a/target/product/base.mk b/target/product/base.mk
index 9dd48b7..0e3647d 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -153,16 +153,16 @@
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)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index a9a288a..523df7a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -144,7 +144,7 @@
# 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,\