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

Commit b62c7d7a authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Store ALL_DEPS under my_register_name" into main am: 6b356857 am: a9b72f93 

Original change: https://android-review.googlesource.com/c/platform/build/+/2835092



Change-Id: I7246f295d2394228848fdd647b41da3b64fca9a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c5f961b a9b72f93

core/base_rules.mk

+3 −4
Original line number Diff line number Diff line
@@ -1156,10 +1156,9 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name) 


##########################################################

# Track module-level dependencies.

# Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness.

# (b/204397180) Unlock RECORD_ALL_DEPS was acknowledged reasonable for better Atest performance.

ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \

  $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \

ALL_MODULES.$(my_register_name).ALL_DEPS := \

  $(ALL_MODULES.$(my_register_name).ALL_DEPS) \

  $(LOCAL_STATIC_LIBRARIES) \

  $(LOCAL_WHOLE_STATIC_LIBRARIES) \

  $(LOCAL_SHARED_LIBRARIES) \
@@ -1169,7 +1168,7 @@ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ 
  $(LOCAL_HEADER_LIBRARIES) \

  $(LOCAL_STATIC_JAVA_LIBRARIES) \

  $(LOCAL_JAVA_LIBRARIES) \

  $(LOCAL_JNI_SHARED_LIBRARIES))

  $(LOCAL_JNI_SHARED_LIBRARIES)



###########################################################

## umbrella targets used to verify builds

core/java_common.mk

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ else # LOCAL_IS_HOST_MODULE 
endif # !LOCAL_IS_HOST_MODULE



# (b/204397180) Record ALL_DEPS by default.

ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) $(full_java_bootclasspath_libs)

ALL_MODULES.$(my_register_name).ALL_DEPS := $(ALL_MODULES.$(my_register_name).ALL_DEPS) $(full_java_bootclasspath_libs)



# Export the SDK libs. The sdk library names listed in LOCAL_SDK_LIBRARIES are first exported.

# Then sdk library names exported from dependencies are all re-exported.

core/tasks/module-info.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ $(MODULE_INFO_JSON): 
			'"auto_test_config": [$(ALL_MODULES.$(m).auto_test_config)],' \

			'"module_name": "$(ALL_MODULES.$(m).MODULE_NAME)"$(COMMA)' \

			'"test_config": [$(KATI_foreach_sep w,$(COMMA) ,$(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS)),"$(w)")],' \

			'"dependencies": [$(KATI_foreach_sep w,$(COMMA) ,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)")],' \

			'"dependencies": [$(KATI_foreach_sep w,$(COMMA) ,$(sort $(ALL_MODULES.$(m).ALL_DEPS)),"$(w)")],' \

			'"shared_libs": [$(KATI_foreach_sep w,$(COMMA) ,$(sort $(ALL_MODULES.$(m).SHARED_LIBS)),"$(w)")],' \

			'"static_libs": [$(KATI_foreach_sep w,$(COMMA) ,$(sort $(ALL_MODULES.$(m).STATIC_LIBS)),"$(w)")],' \

			'"system_shared_libs": [$(KATI_foreach_sep w,$(COMMA) ,$(sort $(ALL_MODULES.$(m).SYSTEM_SHARED_LIBS)),"$(w)")],' \