StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Record ALL_DEPS by default." am: 372d74a8c9

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

Change-Id: Ib9fabe5af8c027845c4c3d01e4670f1260083661
This commit is contained in:
Treehugger Robot
2021-11-11 04:49:34 +00:00
committed by Automerger Merge Worker
parent caddb0004f 372d74a8c9
commit 44ce81a207
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/base_rules.mk
View File

@@ -1068,7 +1068,7 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)
########################################################## ##########################################################
# Track module-level dependencies. # Track module-level dependencies.
# Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness. # 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.MODULES += $(LOCAL_MODULE)
ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \
$(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \ $(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*) license_files := $(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*)
ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files)) ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))
endif
########################################################### ###########################################################
## Take care of my_module_tags ## Take care of my_module_tags

3
core/config.mk
View File

@@ -1223,7 +1223,4 @@ endif
DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages) $(kselftest_modules) DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages) $(kselftest_modules)
.KATI_READONLY := DEFAULT_DATA_OUT_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 include $(BUILD_SYSTEM)/dumpvar.mk

3
core/java_common.mk
View File

@@ -378,9 +378,8 @@ else # LOCAL_IS_HOST_MODULE
endif # USE_CORE_LIB_BOOTCLASSPATH endif # USE_CORE_LIB_BOOTCLASSPATH
endif # !LOCAL_IS_HOST_MODULE 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) 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. # 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. # Then sdk library names exported from dependencies are all re-exported.