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

Commit a2c63454 authored by Bill Peckham's avatar Bill Peckham
Browse files

Allow recording ALL_DEPS by setting RECORD_ALL_DEPS 

This change enables recording ALL_DEPS information
without having to specify the deps-license goal, which
can be useful to populate the dependencies field of
module-info.json for various types of post-processing.

Usage: `RECORD_ALL_DEPS=true make droid` (preferred), or
`make RECORD_ALL_DEPS=true droid`.

Test: make, inspect module-info.json
Test: RECORD_ALL_DEPS=true make, inspect module-info.json
Bug: 151755703
Change-Id: Ib81a8dfb0ecbe0b63be320a9d33e558b419cb4b2
parent 32a8c39c

core/base_rules.mk

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

ifneq (,$(filter deps-license,$(MAKECMDGOALS)))

ifdef RECORD_ALL_DEPS

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

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

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

core/config.mk

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

.KATI_READONLY := DEFAULT_DATA_OUT_MODULES



# Make RECORD_ALL_DEPS readonly and also set it if deps-license is a goal.

RECORD_ALL_DEPS :=$= $(filter true,$(RECORD_ALL_DEPS))$(filter deps-license,$(MAKECMDGOALS))



include $(BUILD_SYSTEM)/dumpvar.mk

core/java_common.mk

+2 −0
Original line number Diff line number Diff line
@@ -382,7 +382,9 @@ else # LOCAL_IS_HOST_MODULE 
  endif # USE_CORE_LIB_BOOTCLASSPATH

endif # !LOCAL_IS_HOST_MODULE



ifdef RECORD_ALL_DEPS

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.