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

Commit 09aaa26c authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Move setting default BOARD_VNDK_VERSION value 

Current BOARD_VNDK_VERSION is being set from config.mk, but this is
before build system loads release config and checks if VNDK is
deprecated or not. Move this to envsetup so it can set up
BOARD_VNDK_VERSION only when VNDK is not deprecated with flag.

Bug: 324976878
Test: mainline release target build succeeded

Change-Id: I490cc431038f5cebc40d03c98d2666eaba906664
parent 7d2c5ff0

core/config.mk

+0 −13
Original line number Diff line number Diff line
@@ -374,19 +374,6 @@ ANDROID_BUILDSPEC := $(TOPDIR)buildspec.mk 
endif

-include $(ANDROID_BUILDSPEC)



ifeq ($(KEEP_VNDK),true)

  # Starting in Android U, non-VNDK devices not supported

  # WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without

  # letting upstream know it's important to you, we may do cleanup which breaks this

  # significantly. Please let us know if you are changing this.

  ifndef BOARD_VNDK_VERSION

  # READ WARNING - DO NOT CHANGE

  BOARD_VNDK_VERSION := current

  # READ WARNING - DO NOT CHANGE

  endif

endif





# ---------------------------------------------------------------

# Define most of the global variables.  These are the ones that

# are specific to the user's build configuration.

core/envsetup.mk

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ else 
  KEEP_VNDK ?= true

endif



ifeq ($(KEEP_VNDK),true)

  # Starting in Android U, non-VNDK devices not supported

  # WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without

  # letting upstream know it's important to you, we may do cleanup which breaks this

  # significantly. Please let us know if you are changing this.

  ifndef BOARD_VNDK_VERSION

  # READ WARNING - DO NOT CHANGE

  BOARD_VNDK_VERSION := current

  # READ WARNING - DO NOT CHANGE

  endif

endif



# ---------------------------------------------------------------

# Set up version information

include $(BUILD_SYSTEM)/version_util.mk