diff options
| author | 2020-03-17 15:48:11 -0700 | |
|---|---|---|
| committer | 2020-03-18 17:58:52 -0700 | |
| commit | 21ceb5705738c37df7c430811c3d07bf7abcb03e (patch) | |
| tree | 95d88dd275247764735dbf69e1366770c7aae8a0 | |
| parent | 1c146a617dc289a9478765abb0255cc2b9281e7b (diff) | |
Vendor SKU manifests: define env variables properly
In particular, BOARD_SEPOLICY_VERS may be defined in
system/sepolicy/Android.mk, so defer its evaluation.
Test: build with vendor SKU
Bug: 148601741
Change-Id: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
Merged-In: Iab3f5dcba4edb65deaab38cc2712d22b89e1a83c
| -rw-r--r-- | target/board/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index ffc9baf54a..9edc85c8e4 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -72,9 +72,9 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/vintf GEN := $$(local-generated-sources-dir)/manifest_$(1).xml $$(GEN): PRIVATE_SRC_FILES := $$(my_fragment_files) $$(GEN): $$(my_fragment_files) $$(HOST_OUT_EXECUTABLES)/assemble_vintf - BOARD_SEPOLICY_VERS=$(BOARD_SEPOLICY_VERS) \ - PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \ - PRODUCT_SHIPPING_API_LEVEL=$(PRODUCT_SHIPPING_API_LEVEL) \ + BOARD_SEPOLICY_VERS=$$(BOARD_SEPOLICY_VERS) \ + PRODUCT_ENFORCE_VINTF_MANIFEST=$$(PRODUCT_ENFORCE_VINTF_MANIFEST) \ + PRODUCT_SHIPPING_API_LEVEL=$$(PRODUCT_SHIPPING_API_LEVEL) \ $$(HOST_OUT_EXECUTABLES)/assemble_vintf -o $$@ \ -i $$(call normalize-path-list,$$(PRIVATE_SRC_FILES)) |