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

Commit 9ccc880a authored by Justin Yun's avatar Justin Yun
Browse files

Define PRODUCT_PRODUCT_VNDK_VERSION as current by default 

It has been mandatory since Android 11 (rvc) launching devices. Now we
can enable the product variants by default to all devices.

Bug: 300371698
Test: TH
Change-Id: I6b2d2e8e105ca35c38db8132486b1cb3bdbab40f
parent 1e042d46

core/product_config.mk

+4 −22
Original line number Diff line number Diff line
@@ -546,29 +546,11 @@ endif 


$(KATI_obsolete_var OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE,Use PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE instead)



# If build command defines PRODUCT_USE_PRODUCT_VNDK_OVERRIDE as `false`,

# PRODUCT_PRODUCT_VNDK_VERSION will not be defined automatically.

# PRODUCT_USE_PRODUCT_VNDK_OVERRIDE can be used for testing only.

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. 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.

  PRODUCT_USE_PRODUCT_VNDK := true

endif



ifeq ($(PRODUCT_USE_PRODUCT_VNDK),true)

# From Android V, Define PRODUCT_PRODUCT_VNDK_VERSION as current by default.

# This is required to make all devices have product variants.

ifndef PRODUCT_PRODUCT_VNDK_VERSION

  PRODUCT_PRODUCT_VNDK_VERSION := current

endif

endif



$(KATI_obsolete_var PRODUCT_USE_PRODUCT_VNDK,Use PRODUCT_PRODUCT_VNDK_VERSION instead)

$(KATI_obsolete_var PRODUCT_USE_PRODUCT_VNDK_OVERRIDE,Use PRODUCT_PRODUCT_VNDK_VERSION instead)



ifdef PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS

    $(error PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS is deprecated, consider using RRO for \