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

Commit 18072060 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Record ALL_DEPS by default." am: 372d74a8 am: 44ce81a2 am: 97e85dcf 

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

Change-Id: Ie3857d2cbe402003f02981aaf21bfd0217d4725d
parents 4f869bee 97e85dcf

core/base_rules.mk

+1 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ 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.

ifdef RECORD_ALL_DEPS

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

ALL_DEPS.MODULES += $(LOCAL_MODULE)

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

  $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \
@@ -1085,7 +1085,6 @@ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ 


license_files := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*)

ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))

endif



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

## Take care of my_module_tags

core/config.mk

+0 −3
Original line number Diff line number Diff line
@@ -1223,7 +1223,4 @@ endif 
DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages) $(kselftest_modules)

.KATI_READONLY := DEFAULT_DATA_OUT_MODULES



# Make RECORD_ALL_DEPS readonly.

RECORD_ALL_DEPS :=$= $(filter true,$(RECORD_ALL_DEPS))



include $(BUILD_SYSTEM)/dumpvar.mk

core/java_common.mk

+1 −2
Original line number Diff line number Diff line
@@ -378,9 +378,8 @@ else # LOCAL_IS_HOST_MODULE 
  endif # USE_CORE_LIB_BOOTCLASSPATH

endif # !LOCAL_IS_HOST_MODULE



ifdef RECORD_ALL_DEPS

# (b/204397180) Record ALL_DEPS by default.

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

endif



# 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.