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

Record ALL_DEPS by default.

Browse Source 
Abandon the use of RECORD_ALL_DEPS to record ALL_DEPS.

BUG: 204397180

Test: m, and inspect module-info.json.
Change-Id: Iaf35580b52c11ad37017b1fb8e0937b859d3f55b
This commit is contained in:
Jim Tang
2021-11-03 16:13:05 +08:00
parent db7732900b
commit 5c6410edee
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

@@ -1071,7 +1071,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) \
@@ -1088,7 +1088,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

3
core/config.mk
View File

@@ -1212,7 +1212,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

3
core/java_common.mk
View File

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