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

Commit a7f1ee1a authored by Jeongik Cha's avatar Jeongik Cha Committed by android-build-merger
Browse files

Merge "Turn on PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE if PRODUCT_SHIPPING_API_LEVEL > 29"

am: 02b1498d

Change-Id: Idd23b218bc9c6203865f642d78dfa4c3bafdbdc6
parents 24102883 02b1498d
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -344,6 +344,16 @@ endif
$(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \
    ,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)

ifdef OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE
  PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := $(OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE)
else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
  # No shipping level defined
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true)
  PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
endif

$(KATI_obsolete_var OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE,Use PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE instead)

define product-overrides-config
$$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\
    $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\