Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3388670e authored by Colin Cross's avatar Colin Cross
Browse files

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
parent cb6f7c2d

core/dex_preopt_odex_install.mk

+1 −1
Original line number Diff line number Diff line
@@ -142,6 +142,6 @@ DEXPREOPT.MODULES.$(LOCAL_MODULE_CLASS) := $(sort \ 




# Make sure to install the .odex and .vdex when you run "make <module_name>"

$(my_register_name): $(installed_odex) $(installed_vdex)

$(my_all_targets): $(installed_odex) $(installed_vdex)



endif # LOCAL_DEX_PREOPT

core/package_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 <module_name>".

$(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

core/prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 <module_name>".

$(my_register_name): $(installed_apk_splits)

$(my_all_targets): $(installed_apk_splits)



endif # LOCAL_PACKAGE_SPLITS