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

Commit b6e788ff authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Replace usages of my_register_name with my_all_targets" am: 077d9d5f... 

Merge "Replace usages of my_register_name with my_all_targets" am: 077d9d5f am: e373117c am: 1f351ad7
am: fba6042e

Change-Id: Id807306cce8447e7170e9c344ce07eb6e03fda52
parents b3609e68 fba6042e

core/dex_preopt_odex_install.mk

+1 −1
Original line number Diff line number Diff line
@@ -138,6 +138,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
@@ -586,7 +586,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)
@@ -597,7 +597,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
@@ -358,7 +358,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