From 3388670e7866f357be947c079680c13323760dbf Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 20 Sep 2016 16:01:28 -0700 Subject: [PATCH] Replace usages of my_register_name with my_all_targets A few module types add extra dependencies on $(my_register_name), move them to $(my_all_targets) so that they are built for mm and mma too. Bug: 31526036 Test: mmm framework Change-Id: I2e594ce771451a99691739b963f4ce517e9dd595 --- core/dex_preopt_odex_install.mk | 2 +- core/package_internal.mk | 4 ++-- core/prebuilt_internal.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 16e930777..0966bd52f 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -142,6 +142,6 @@ DEXPREOPT.MODULES.$(LOCAL_MODULE_CLASS) := $(sort \ # Make sure to install the .odex and .vdex when you run "make " -$(my_register_name): $(installed_odex) $(installed_vdex) +$(my_all_targets): $(installed_odex) $(installed_vdex) endif # LOCAL_DEX_PREOPT diff --git a/core/package_internal.mk b/core/package_internal.mk index 3c3523ce4..af1d2a5dc 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -579,7 +579,7 @@ ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \ $(foreach s,$(my_split_suffixes),$(built_module_path)/package_$(s).apk:$(my_module_path)/$(LOCAL_MODULE)_$(s).apk) # Make sure to install the splits when you run "make ". -$(my_register_name): $(installed_apk_splits) +$(my_all_targets): $(installed_apk_splits) ifdef LOCAL_COMPATIBILITY_SUITE cts_testcase_file := $(foreach s,$(my_split_suffixes),$(COMPATIBILITY_TESTCASES_OUT_$(LOCAL_COMPATIBILITY_SUITE))/$(LOCAL_MODULE)_$(s).apk) @@ -590,7 +590,7 @@ COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES := \ $(COMPATIBILITY.$(LOCAL_COMPATIBILITY_SUITE).FILES) \ $(cts_testcase_file) -$(my_register_name) : $(cts_testcase_file) +$(my_all_targets) : $(cts_testcase_file) endif # LOCAL_COMPATIBILITY_SUITE endif # LOCAL_PACKAGE_SPLITS diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 1aa864db1..c3cc8074e 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -336,7 +336,7 @@ ALL_MODULES.$(my_register_name).BUILT_INSTALLED += \ $(foreach s,$(LOCAL_PACKAGE_SPLITS),$(built_module_path)/$(notdir $(s)):$(my_module_path)/$(notdir $(s))) # Make sure to install the splits when you run "make ". -$(my_register_name): $(installed_apk_splits) +$(my_all_targets): $(installed_apk_splits) endif # LOCAL_PACKAGE_SPLITS