diff options
| author | 2019-01-19 01:48:39 +0000 | |
|---|---|---|
| committer | 2019-01-19 01:48:39 +0000 | |
| commit | 6bd6318880b4e3868e559ea9e147355f9eb00867 (patch) | |
| tree | 8be298408f80af2d035c1f7fa3a41af7eb82e7d7 | |
| parent | ffaf4815fcd381a3f29fd1763256dc1fe1b1d5d6 (diff) | |
| parent | 83c50324cad067b4cb09e8a681272d60957f51cb (diff) | |
Merge "Define non-system module as variable"
| -rw-r--r-- | core/app_certificate_validate.mk | 4 | ||||
| -rw-r--r-- | core/base_rules.mk | 6 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/package_internal.mk | 4 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 4 | ||||
| -rw-r--r-- | core/soong_app_prebuilt.mk | 4 |
6 files changed, 11 insertions, 12 deletions
diff --git a/core/app_certificate_validate.mk b/core/app_certificate_validate.mk index 15ddd94500..6d3fdc8ce6 100644 --- a/core/app_certificate_validate.mk +++ b/core/app_certificate_validate.mk @@ -1,7 +1,5 @@ -ifeq (true,$(filter true, \ - $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \ - $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE))) +ifeq (true,$(non_system_module)) ifneq (,$(filter $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))%,$(LOCAL_CERTIFICATE))) CERTIFICATE_VIOLATION_MODULES += $(LOCAL_MODULE) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT)) diff --git a/core/base_rules.mk b/core/base_rules.mk index cb9c35ac5d..64e1069b59 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -96,6 +96,12 @@ ifneq ($(filter-out $(LOCAL_PROPRIETARY_MODULE),$(LOCAL_VENDOR_MODULE))$(filter- $(call pretty-error,Only one of LOCAL_PROPRIETARY_MODULE[$(LOCAL_PROPRIETARY_MODULE)] and LOCAL_VENDOR_MODULE[$(LOCAL_VENDOR_MODULE)] may be set, or they must be equal) endif +non_system_module := $(filter true, \ + $(LOCAL_PRODUCT_MODULE) \ + $(LOCAL_PRODUCT_SERVICES_MODULE) \ + $(LOCAL_VENDOR_MODULE) \ + $(LOCAL_PROPRIETARY_MODULE)) + include $(BUILD_SYSTEM)/local_vndk.mk include $(BUILD_SYSTEM)/local_systemsdk.mk diff --git a/core/clear_vars.mk b/core/clear_vars.mk index b47071a23c..f9e07f89e4 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -494,6 +494,7 @@ LOCAL_CUSTOM_BUILD_STEP_OUTPUT:= LOCAL_IS_AUX_MODULE := full_android_manifest := +non_system_module := # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. diff --git a/core/package_internal.mk b/core/package_internal.mk index 75ed0dfdae..9ddbd1b6b1 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -574,9 +574,7 @@ endif # Run veridex on product, product_services and vendor modules. # We skip it for unbundled app builds where we cannot build veridex. module_run_appcompat := -ifeq (true,$(filter true, \ - $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \ - $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE))) +ifeq (true,$(non_system_module)) ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build module_run_appcompat := true endif diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index becce19b9f..9b995e28a7 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -72,9 +72,7 @@ endif # Run veridex on product, product_services and vendor modules. # We skip it for unbundled app builds where we cannot build veridex. module_run_appcompat := -ifeq (true,$(filter true, \ - $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \ - $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE))) +ifeq (true,$(non_system_module)) ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build module_run_appcompat := true endif diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index eb201e66ec..a6315b40d7 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -44,9 +44,7 @@ endif # Run veridex on product, product_services and vendor modules. # We skip it for unbundled app builds where we cannot build veridex. module_run_appcompat := -ifeq (true,$(filter true, \ - $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \ - $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE))) +ifeq (true,$(non_system_module)) ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build module_run_appcompat := true endif |