From eaef4d8b9ff470e965244b899a92b94e643f1ae0 Mon Sep 17 00:00:00 2001 From: Po Hu Date: Wed, 10 Oct 2018 13:13:38 +0800 Subject: [PATCH] Initialize variable to fix wrong odex installed When "PRODUCT_DEX_PREOPT_GENERATE_DM_FILES := true" and "PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := verify" are set, boot jar may wrongly refer to previous module's variables such as my_generate_dm, my_built_dm and my_installed_dm. And then cause unexpected files installed along with this boot jar. So initialize my_generate_dm to empty at first. Bug: 117526952 Test: make out/target/product/generic/module-info.json Test: cat out/target/product/generic/module-info.json | grep '"apache-xml":' Change-Id: Iaa851f4fb530b3446de3dbcb1f54e545938830ce --- core/dex_preopt_odex_install.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 54f8cccdfe..4bdd1df6f3 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -101,6 +101,7 @@ built_installed_vdex := built_installed_art := my_process_profile := my_profile_is_text_listing := +my_generate_dm := ifeq (false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)) LOCAL_DEX_PREOPT_GENERATE_PROFILE := false