diff options
-rw-r--r-- | core/dex_preopt_odex_install.mk | 6 | ||||
-rw-r--r-- | core/product.mk | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 613b058..10b41bd 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -32,6 +32,12 @@ endif ifneq (,$(filter $(LOCAL_MODULE),$(PRODUCT_DEX_PREOPT_PACKAGES_IN_DATA))) LOCAL_DEX_PREOPT := endif +# if WITH_DEXPREOPT_BOOT_IMG_ONLY=true and module is not in boot class path skip +ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY)) +ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),) +LOCAL_DEX_PREOPT := +endif +endif built_odex := installed_odex := diff --git a/core/product.mk b/core/product.mk index fd405ad..dbf49b5 100644 --- a/core/product.mk +++ b/core/product.mk @@ -253,7 +253,8 @@ _product_stash_var_list += \ _product_stash_var_list += \ DEFAULT_SYSTEM_DEV_CERTIFICATE \ - WITH_DEXPREOPT + WITH_DEXPREOPT \ + WITH_DEXPREOPT_BOOT_IMG_ONLY # # Stash values of the variables in _product_stash_var_list. |