Merge "Add precompiled hash only when policy exists"
This commit is contained in:
commit
785ac2bf1a
1 changed files with 13 additions and 3 deletions
16
Android.mk
16
Android.mk
|
@ -429,8 +429,10 @@ LOCAL_LICENSE_CONDITIONS := notice unencumbered
|
|||
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
|
||||
# Include precompiled policy, unless told otherwise.
|
||||
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
|
||||
ifdef HAS_SYSTEM_EXT_SEPOLICY
|
||||
LOCAL_REQUIRED_MODULES += system_ext_sepolicy_and_mapping.sha256
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef HAS_SYSTEM_EXT_SEPOLICY
|
||||
LOCAL_REQUIRED_MODULES += system_ext_sepolicy.cil
|
||||
|
@ -474,8 +476,10 @@ LOCAL_LICENSE_CONDITIONS := notice unencumbered
|
|||
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
|
||||
# Include precompiled policy, unless told otherwise.
|
||||
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
|
||||
ifdef HAS_PRODUCT_SEPOLICY
|
||||
LOCAL_REQUIRED_MODULES += product_sepolicy_and_mapping.sha256
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef HAS_PRODUCT_SEPOLICY
|
||||
LOCAL_REQUIRED_MODULES += product_sepolicy.cil
|
||||
|
@ -520,9 +524,15 @@ LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
|
|||
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
|
||||
LOCAL_REQUIRED_MODULES += \
|
||||
precompiled_sepolicy \
|
||||
precompiled_sepolicy.plat_sepolicy_and_mapping.sha256 \
|
||||
precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256 \
|
||||
precompiled_sepolicy.product_sepolicy_and_mapping.sha256 \
|
||||
precompiled_sepolicy.plat_sepolicy_and_mapping.sha256
|
||||
|
||||
ifdef HAS_SYSTEM_EXT_SEPOLICY
|
||||
LOCAL_REQUIRED_MODULES += precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
|
||||
endif
|
||||
|
||||
ifdef HAS_PRODUCT_SEPOLICY
|
||||
LOCAL_REQUIRED_MODULES += precompiled_sepolicy.product_sepolicy_and_mapping.sha256
|
||||
endif
|
||||
|
||||
endif # ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
|
||||
|
||||
|
|
Loading…
Reference in a new issue