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

Commit 83c50324 authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Define non-system module as variable 

Define non_system_module in base_rules.mk when the module is product, vendor,
product_services or proprietary module.

Bug: 74699609

Test: m -j
Change-Id: Iebdd3ec8c643be3d9877b7a96cbdd83465fa3878
parent aa58210d

core/app_certificate_validate.mk

+1 −3
Original line number Original line Diff line number Diff line 




ifeq (true,$(filter true, \

ifeq (true,$(non_system_module))

   $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

  ifneq (,$(filter $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))%,$(LOCAL_CERTIFICATE)))

  ifneq (,$(filter $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))%,$(LOCAL_CERTIFICATE)))

    CERTIFICATE_VIOLATION_MODULES += $(LOCAL_MODULE)

    CERTIFICATE_VIOLATION_MODULES += $(LOCAL_MODULE)

    ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT))

    ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT))

core/base_rules.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -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)

$(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

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_vndk.mk

include $(BUILD_SYSTEM)/local_systemsdk.mk

include $(BUILD_SYSTEM)/local_systemsdk.mk

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -494,6 +494,7 @@ LOCAL_CUSTOM_BUILD_STEP_OUTPUT:= 
LOCAL_IS_AUX_MODULE :=

LOCAL_IS_AUX_MODULE :=





full_android_manifest :=

full_android_manifest :=

non_system_module :=





# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.

# iterate over thousands of entries every time.

core/package_internal.mk

+1 −3
Original line number Original line Diff line number Diff line
@@ -574,9 +574,7 @@ endif 
# Run veridex on product, product_services and vendor modules.

# Run veridex on product, product_services and vendor modules.

# We skip it for unbundled app builds where we cannot build veridex.

# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

module_run_appcompat :=

ifeq (true,$(filter true, \

ifeq (true,$(non_system_module))

   $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

  module_run_appcompat := true

  module_run_appcompat := true

endif

endif

core/prebuilt_internal.mk

+1 −3
Original line number Original line Diff line number Diff line
@@ -72,9 +72,7 @@ endif 
# Run veridex on product, product_services and vendor modules.

# Run veridex on product, product_services and vendor modules.

# We skip it for unbundled app builds where we cannot build veridex.

# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

module_run_appcompat :=

ifeq (true,$(filter true, \

ifeq (true,$(non_system_module))

   $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

  module_run_appcompat := true

  module_run_appcompat := true

endif

endif