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

Commit cf972638 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enforce product interface by default"

parents a2a2f404 308d02fd

core/product_config.mk

+4 −2
Original line number Diff line number Diff line
@@ -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.