Merge "Enforce product interface by default" am: cf97263876
Original change: https://android-review.googlesource.com/c/platform/build/+/2499395 Change-Id: I950bd24c4932d3abfc4951e2c843df23c7c07656 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -517,7 +517,8 @@ ifdef OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE
|
||||
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := $(OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE)
|
||||
endif
|
||||
else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
|
||||
# No shipping level defined
|
||||
# No shipping level defined. Enforce the product interface by default.
|
||||
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
|
||||
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true)
|
||||
# Enforce product interface if PRODUCT_SHIPPING_API_LEVEL is greater than 29.
|
||||
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
|
||||
@@ -532,7 +533,8 @@ PRODUCT_USE_PRODUCT_VNDK := false
|
||||
ifneq ($(PRODUCT_USE_PRODUCT_VNDK_OVERRIDE),)
|
||||
PRODUCT_USE_PRODUCT_VNDK := $(PRODUCT_USE_PRODUCT_VNDK_OVERRIDE)
|
||||
else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
|
||||
# No shipping level defined
|
||||
# No shipping level defined. Enforce the product interface by default.
|
||||
PRODUCT_USE_PRODUCT_VNDK := true
|
||||
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true)
|
||||
# Enforce product interface for VNDK if PRODUCT_SHIPPING_API_LEVEL is greater
|
||||
# than 29.
|
||||
|
Reference in New Issue
Block a user