diff options
-rw-r--r-- | core/dex_preopt_libart.mk | 4 | ||||
-rw-r--r-- | target/product/base.mk | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index d064e8c..ae2c586 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -16,7 +16,9 @@ DEX2OAT_DEPENDENCY += $(DEX2OAT) DEX2OATD_DEPENDENCY := $(DEX2OAT_DEPENDENCY) DEX2OATD_DEPENDENCY += $(DEX2OATD) -PRELOADED_CLASSES := frameworks/base/preloaded-classes +# Use the first preloaded-classes file in PRODUCT_COPY_FILES. +PRELOADED_CLASSES := $(call word-colon,1,$(firstword \ + $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES)))) # Default to debug version to help find bugs. # Set USE_DEX2OAT_DEBUG to false for only building non-debug versions. diff --git a/target/product/base.mk b/target/product/base.mk index 9713330..d6fb66a 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -115,4 +115,8 @@ PRODUCT_PACKAGES += \ wm +PRODUCT_COPY_FILES := \ + frameworks/base/preloaded-classes:system/etc/preloaded-classes + + $(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk) |