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

Commit 916b368b authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS" 

am: 2faec12c

Change-Id: I97b262be7c4947b08914eb0d2a1fbf8db902b38d
parents 5aa1aecc 2faec12c

core/product_config.mk

+9 −0
Original line number Diff line number Diff line
@@ -384,6 +384,15 @@ ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),) 
  endif

endif



# If build command defines OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS,

# override PRODUCT_EXTRA_VNDK_VERSIONS with it.

ifdef OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS

  PRODUCT_EXTRA_VNDK_VERSIONS := $(OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS)

endif



$(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \

    ,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)



define product-overrides-config

$$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\

    $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\