commit ef2d489043059319da0a28cbe990b7cc8e180c82
author Yo Chiang <yochiang@google.com> Fri May 08 15:38:40 2020 +0800
committer Yo Chiang <yochiang@google.com> Fri May 08 16:17:09 2020 +0800
tree 2e6070bef6fa759f187b6b6de2240772421531b0
parent 18bbde16156da14d66eb93aa074aede17834ea45

Register ALL_MODULES subvars with my_register_name

Replace ALL_MODULES.$(LOCAL_MODULE) with
ALL_MODULES.$(my_register_name).

Test: TH presubmit build pass
Change-Id: Ic1fb859ae458d1c67cc1d3699199ef36476088db

apex/androidmk.go

diff --git a/apex/androidmk.go b/apex/androidmk.go
index db1048e..2c5407c 100644
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@@ -308,7 +308,7 @@
 				fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
 
 				if apexType == imageApex {
-					fmt.Fprintln(w, "ALL_MODULES.$(LOCAL_MODULE).BUNDLE :=", a.bundleModuleFile.String())
+					fmt.Fprintln(w, "ALL_MODULES.$(my_register_name).BUNDLE :=", a.bundleModuleFile.String())
 				}
 
 				if a.installedFilesFile != nil {