summaryrefslogtreecommitdiffstats
path: root/core/dex_preopt_libart.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-11-13 15:19:12 -0800
committerYing Wang <wangying@google.com>2014-11-17 11:26:29 -0800
commit0c9b3bac65e1ba3d57371c71ff6a0b524558451f (patch)
tree294426e1286257606d03e960a75e103a8133de21 /core/dex_preopt_libart.mk
parent8df7653d5608e5d459758a91e6c677c7d5fcc43f (diff)
downloadbuild-0c9b3bac65e1ba3d57371c71ff6a0b524558451f.zip
build-0c9b3bac65e1ba3d57371c71ff6a0b524558451f.tar.gz
build-0c9b3bac65e1ba3d57371c71ff6a0b524558451f.tar.bz2
Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file /system/etc/preloaded-classes, so we can configure different file per product. To override the default frameworks/base/preloaded-classes, just override in your product configuration makefile with PRODUCT_COPY_FILES before it inherits from build/target/product/base.mk: if there are multiple items in PRODUCT_COPY_FILES with the same destination, the first one takes precedence. Bug: 18305157 Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
Diffstat (limited to 'core/dex_preopt_libart.mk')
-rw-r--r--core/dex_preopt_libart.mk4
1 files changed, 3 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.