From 5814247ed2148fc3ebdbba4bbbf0f3674f906516 Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Fri, 8 May 2020 15:38:46 +0800 Subject: [PATCH] Access ALL_MODULES subvars with my_register_name ALL_MODULES and subvars are registered with my_register_name. Replace references of ALL_MODULES.$(LOCAL_MODULE).* with ALL_MODULES.$(my_register_name).*. Bug: 155869107 Test: TH presubmit build pass Test: TH presubmit build noop Change-Id: I1481c341a285dc04de86619abec3194bb92c9739 --- core/executable_prefer_symlink.mk | 2 +- core/install_jni_libs_internal.mk | 6 +++--- core/java.mk | 2 +- core/package_internal.mk | 2 +- core/soong_app_prebuilt.mk | 2 +- core/soong_java_prebuilt.mk | 2 +- core/static_java_library.mk | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/executable_prefer_symlink.mk b/core/executable_prefer_symlink.mk index 9b9814e3b8..ad6698df66 100644 --- a/core/executable_prefer_symlink.mk +++ b/core/executable_prefer_symlink.mk @@ -40,7 +40,7 @@ $(call symlink-file,$(my_module_path)/$(my_src_binary_name),$(my_src_binary_name # We need this so that the installed files could be picked up based on the # local module name -ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_symlink) +ALL_MODULES.$(my_register_name).INSTALLED += $(my_symlink) # Create the symlink when you run mm/mmm or "make " $(LOCAL_MODULE) : $(my_symlink) diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index b482eb59ba..93a76662b7 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -59,7 +59,7 @@ else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES)) my_installed_library := $(addprefix $(my_shared_library_path)/, $(my_jni_filenames)) - ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library) + ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed_library) # Create symlink in the app specific lib path # Skip creating this symlink when running the second part of a target sanitization build. @@ -72,7 +72,7 @@ else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni $(my_symlink_target_dir)/$(lib), \ $(my_app_lib_path)/$(lib)) \ $(eval $$(LOCAL_INSTALLED_MODULE) : $$(my_app_lib_path)/$$(lib)) \ - $(eval ALL_MODULES.$$(LOCAL_MODULE).INSTALLED += $$(my_app_lib_path)/$$(lib))) + $(eval ALL_MODULES.$(my_register_name).INSTALLED += $$(my_app_lib_path)/$$(lib))) endif # Clear jni_shared_libraries to not embed it into the apk. @@ -100,7 +100,7 @@ ifdef my_prebuilt_jni_libs my_installed_library := $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs))) $(LOCAL_INSTALLED_MODULE) : $(my_installed_library) - ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library) + ALL_MODULES.$(my_register_name).INSTALLED += $(my_installed_library) endif # my_embed_jni endif # inner my_prebuilt_jni_libs endif # outer my_prebuilt_jni_libs diff --git a/core/java.mk b/core/java.mk index 61a3ad3eaf..9d42775a9b 100644 --- a/core/java.mk +++ b/core/java.mk @@ -207,7 +207,7 @@ ifdef full_classes_jar # allowing it to use the classes.jar as the "stubs" that would be use to link # against, for the cases where someone needs the jar to link against. $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_stubs_jar))) -ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar) +ALL_MODULES.$(my_register_name).STUBS := $(full_classes_stubs_jar) # The layers file allows you to enforce a layering between java packages. # Run build/make/tools/java-layers.py for more details. diff --git a/core/package_internal.mk b/core/package_internal.mk index 034a36ecaa..775ee4853a 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -629,7 +629,7 @@ $(my_bundle_module): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP) endif # full_classes_jar $(MERGE_ZIPS) $@ $@.parts/*.zip rm -rf $@.parts -ALL_MODULES.$(LOCAL_MODULE).BUNDLE := $(my_bundle_module) +ALL_MODULES.$(my_register_name).BUNDLE := $(my_bundle_module) ifdef TARGET_BUILD_APPS ifdef LOCAL_DPI_VARIANTS diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index 4197c58b3e..09c79f6252 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -167,7 +167,7 @@ endif PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag) ifdef LOCAL_SOONG_BUNDLE - ALL_MODULES.$(LOCAL_MODULE).BUNDLE := $(LOCAL_SOONG_BUNDLE) + ALL_MODULES.$(my_register_name).BUNDLE := $(LOCAL_SOONG_BUNDLE) endif ifndef LOCAL_IS_HOST_MODULE diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 509e3f6f82..b15e7f68bf 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -133,7 +133,7 @@ ALL_MODULES.$(my_register_name).CLASSES_JAR := $(full_classes_jar) $(my_register_name): $(my_installed) ifdef LOCAL_SOONG_AAR - ALL_MODULES.$(LOCAL_MODULE).AAR := $(LOCAL_SOONG_AAR) + ALL_MODULES.$(my_register_name).AAR := $(LOCAL_SOONG_AAR) endif javac-check : $(full_classes_jar) diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 7eef167e11..81dc2dfc4e 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -209,7 +209,7 @@ $(built_aar) : $(aar_classes_jar) $(full_android_manifest) $(intermediates.COMMO $(call jar-args-sorted-files-in-directory,$(dir $@)aar) # Register the aar file. -ALL_MODULES.$(LOCAL_MODULE).AAR := $(built_aar) +ALL_MODULES.$(my_register_name).AAR := $(built_aar) endif # need_compile_res # Reset internal variables.