StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move setting default BOARD_VNDK_VERSION value

Browse Source 
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
This commit is contained in:
Kiyoung Kim
2024-02-13 13:38:16 +09:00
parent 7d2c5ff02d
commit 09aaa26c06
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/config.mk
View File

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

12
core/envsetup.mk
View File

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