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

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

Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS 

As a PRODUCT variable, PRODUCT_EXTRA_VNDK_VERSIONS is not allowed to
be assigned from the build command. Instead, we can use
OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS in the build command to
override PRODUCT_EXTRA_VNDK_VERSIONS.

Bug: 132412510
Test: OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS=28 m vndk_snapshot_package
Change-Id: I91579961ab393f40ddce8bfe9304829b5b669441
parent 196f64bc

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)))),,\