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

Merge "Move setting default BOARD_VNDK_VERSION value" into main am: 9b3d6f91aa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2960351

Change-Id: I066fb29a388a0311fc9170dbe10a1c810deef71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-02-13 13:57:49 +00:00
committed by Automerger Merge Worker
parent fee2a4b65e 9b3d6f91aa
commit d8c04fd026
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 endif
-include $(ANDROID_BUILDSPEC) -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 # Define most of the global variables. These are the ones that
# are specific to the user's build configuration. # are specific to the user's build configuration.

12
core/envsetup.mk
View File

@@ -57,6 +57,18 @@ else
KEEP_VNDK ?= true KEEP_VNDK ?= true
endif 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 # Set up version information
include $(BUILD_SYSTEM)/version_util.mk include $(BUILD_SYSTEM)/version_util.mk