diff options
| author | 2019-01-18 19:37:47 -0800 | |
|---|---|---|
| committer | 2019-03-20 10:22:21 -0700 | |
| commit | 1b83413b5a765204e3def88ab758139df27123c2 (patch) | |
| tree | bf7537444d647748f1f8e7951d6a80f75ebe8a63 | |
| parent | bec4aa868a06433b61eec0e796e63fc3b1a24935 (diff) | |
Add module-target-built-files function
This is similar to module-built-files, except that it only returns
files built for the target, not the host.
Bug: 119423884
Test: Build with the no-vendor-variant VNDK change that uses this
function.
Change-Id: I2a3d99003b05999eae01c0b90bb62b5263d65592
| -rw-r--r-- | core/base_rules.mk | 4 | ||||
| -rw-r--r-- | core/definitions.mk | 12 | ||||
| -rw-r--r-- | core/dpi_specific_apk.mk | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 742119f933..7e7d6dce1d 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -776,6 +776,10 @@ ALL_MODULES.$(my_register_name).CHECKED := \ $(ALL_MODULES.$(my_register_name).CHECKED) $(my_checked_module) ALL_MODULES.$(my_register_name).BUILT := \ $(ALL_MODULES.$(my_register_name).BUILT) $(LOCAL_BUILT_MODULE) +ifndef LOCAL_IS_HOST_MODULE +ALL_MODULES.$(my_register_name).TARGET_BUILT := \ + $(ALL_MODULES.$(my_register_name).TARGET_BUILT) $(LOCAL_BUILT_MODULE) +endif ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ALL_MODULES.$(my_register_name).INSTALLED := \ $(strip $(ALL_MODULES.$(my_register_name).INSTALLED) \ diff --git a/core/definitions.mk b/core/definitions.mk index d2f65ebd6d..2764401351 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -651,6 +651,18 @@ endef ########################################################### ## Convert a list of short modules names (e.g., "framework", "Browser") +## into the list of files that are built *for the target* for those modules. +## NOTE: this won't return reliable results until after all +## sub-makefiles have been included. +## $(1): target list +########################################################### + +define module-target-built-files +$(foreach module,$(1),$(ALL_MODULES.$(module).TARGET_BUILT)) +endef + +########################################################### +## Convert a list of short modules names (e.g., "framework", "Browser") ## into the list of files that should be used when linking ## against that module as a public API. ## TODO: Allow this for more than JAVA_LIBRARIES modules diff --git a/core/dpi_specific_apk.mk b/core/dpi_specific_apk.mk index ad734b566a..ad073c7eee 100644 --- a/core/dpi_specific_apk.mk +++ b/core/dpi_specific_apk.mk @@ -67,6 +67,7 @@ endif ALL_MODULES += $(dpi_apk_name) ALL_MODULES.$(dpi_apk_name).CLASS := APPS ALL_MODULES.$(dpi_apk_name).BUILT := $(built_dpi_apk) +ALL_MODULES.$(dpi_apk_name).TARGET_BUILT := $(built_dpi_apk) PACKAGES := $(PACKAGES) $(dpi_apk_name) PACKAGES.$(dpi_apk_name).PRIVATE_KEY := $(private_key) PACKAGES.$(dpi_apk_name).CERTIFICATE := $(certificate) |