tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am: 1d952f82a5

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

Change-Id: I3b47559ad8182f8c8c04e345c8ef18bcc90c459a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiyoung Kim 2024-02-13 01:24:47 +00:00 committed by Automerger Merge Worker
commit f74c3b5fe8
8 changed files with 55 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/board_config.mk
View file

@ -970,12 +970,15 @@ define check_vndk_version
$(if $(wildcard $(vndk_path)/*/Android.bp),,$(error VNDK version $(1) not found)) $(if $(wildcard $(vndk_path)/*/Android.bp),,$(error VNDK version $(1) not found))
endef endef
ifeq ($(KEEP_VNDK),true)
ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION)) ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))
$(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current) $(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current)
endif endif
ifneq ($(BOARD_VNDK_VERSION),current) ifneq ($(BOARD_VNDK_VERSION),current)
$(call check_vndk_version,$(BOARD_VNDK_VERSION)) $(call check_vndk_version,$(BOARD_VNDK_VERSION))
endif endif
endif
TARGET_VENDOR_TEST_SUFFIX := /vendor TARGET_VENDOR_TEST_SUFFIX := /vendor
ifeq (,$(TARGET_BUILD_UNBUNDLED)) ifeq (,$(TARGET_BUILD_UNBUNDLED))

35
core/config.mk
View file

@ -374,16 +374,19 @@ ANDROID_BUILDSPEC := $(TOPDIR)buildspec.mk
endif endif
-include $(ANDROID_BUILDSPEC) -include $(ANDROID_BUILDSPEC)
# Starting in Android U, non-VNDK devices not supported ifeq ($(KEEP_VNDK),true)
# WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without # Starting in Android U, non-VNDK devices not supported
# letting upstream know it's important to you, we may do cleanup which breaks this # WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without
# significantly. Please let us know if you are changing this. # letting upstream know it's important to you, we may do cleanup which breaks this
ifndef BOARD_VNDK_VERSION # significantly. Please let us know if you are changing this.
# READ WARNING - DO NOT CHANGE ifndef BOARD_VNDK_VERSION
BOARD_VNDK_VERSION := current # READ WARNING - DO NOT CHANGE
# READ WARNING - DO NOT CHANGE BOARD_VNDK_VERSION := current
# READ WARNING - DO NOT CHANGE
endif
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.
@ -813,13 +816,6 @@ $(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \
requirements := requirements :=
# Set default value of KEEP_VNDK.
ifeq ($(RELEASE_DEPRECATE_VNDK),true)
KEEP_VNDK ?= false
else
KEEP_VNDK ?= true
endif
# BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of # BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED can be true only if early-mount of
# partitions is supported. But the early-mount must be supported for full # partitions is supported. But the early-mount must be supported for full
# treble products, and so BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED should be set # treble products, and so BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED should be set
@ -1293,6 +1289,15 @@ DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages)
include $(BUILD_SYSTEM)/dumpvar.mk include $(BUILD_SYSTEM)/dumpvar.mk
ifneq ($(KEEP_VNDK),true)
ifdef BOARD_VNDK_VERSION
BOARD_VNDK_VERSION=
endif
ifdef PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION=
endif
endif
ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA)) ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA))
ifeq (false,$(SYSTEM_OPTIMIZE_JAVA)) ifeq (false,$(SYSTEM_OPTIMIZE_JAVA))
$(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled) $(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled)

7
core/envsetup.mk
View file

@ -50,6 +50,13 @@ endef
# Release config # Release config
include $(BUILD_SYSTEM)/release_config.mk include $(BUILD_SYSTEM)/release_config.mk
# Set default value of KEEP_VNDK.
ifeq ($(RELEASE_DEPRECATE_VNDK),true)
KEEP_VNDK ?= false
else
KEEP_VNDK ?= true
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Set up version information # Set up version information
include $(BUILD_SYSTEM)/version_util.mk include $(BUILD_SYSTEM)/version_util.mk

10
core/main.mk
View file

@ -225,20 +225,14 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system
# ADDITIONAL_VENDOR_PROPERTIES will be installed in vendor/build.prop if # ADDITIONAL_VENDOR_PROPERTIES will be installed in vendor/build.prop if
# property_overrides_split_enabled is true. Otherwise it will be installed in # property_overrides_split_enabled is true. Otherwise it will be installed in
# /system/build.prop # /system/build.prop
ifeq ($(KEEP_VNDK),true)
ifdef BOARD_VNDK_VERSION ifdef BOARD_VNDK_VERSION
ifeq ($(KEEP_VNDK),true)
ifeq ($(BOARD_VNDK_VERSION),current) ifeq ($(BOARD_VNDK_VERSION),current)
ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION) ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)
else else
ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION) ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)
endif endif
endif endif
# TODO(b/290159430): ro.vndk.deprecate is a temporal variable for deprecating VNDK.
# This variable will be removed once ro.vndk.version can be removed.
ifneq ($(KEEP_VNDK),true)
ADDITIONAL_SYSTEM_PROPERTIES += ro.vndk.deprecate=true
endif
endif endif
# Add cpu properties for bionic and ART. # Add cpu properties for bionic and ART.

2
core/soong_config.mk
View file

@ -147,8 +147,10 @@ $(call add_json_bool, ArtUseReadBarrier, $(call invert_bool,$(fi
$(call add_json_str, BtConfigIncludeDir, $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)) $(call add_json_str, BtConfigIncludeDir, $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR))
$(call add_json_list, DeviceKernelHeaders, $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS)) $(call add_json_list, DeviceKernelHeaders, $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS))
$(call add_json_str, VendorApiLevel, $(BOARD_API_LEVEL)) $(call add_json_str, VendorApiLevel, $(BOARD_API_LEVEL))
ifeq ($(KEEP_VNDK),true)
$(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION)) $(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION))
$(call add_json_str, Platform_vndk_version, $(PLATFORM_VNDK_VERSION)) $(call add_json_str, Platform_vndk_version, $(PLATFORM_VNDK_VERSION))
endif
$(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS)) $(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS))
$(call add_json_list, DeviceSystemSdkVersions, $(BOARD_SYSTEMSDK_VERSIONS)) $(call add_json_list, DeviceSystemSdkVersions, $(BOARD_SYSTEMSDK_VERSIONS))
$(call add_json_str, RecoverySnapshotVersion, $(RECOVERY_SNAPSHOT_VERSION)) $(call add_json_str, RecoverySnapshotVersion, $(RECOVERY_SNAPSHOT_VERSION))

24
core/version_util.mk
View file

@ -157,21 +157,23 @@ ifndef DEFAULT_APP_TARGET_SDK
endif endif
.KATI_READONLY := DEFAULT_APP_TARGET_SDK .KATI_READONLY := DEFAULT_APP_TARGET_SDK
ifndef PLATFORM_VNDK_VERSION ifeq ($(KEEP_VNDK),true)
# This is the definition of the VNDK version for the current VNDK libraries. ifndef PLATFORM_VNDK_VERSION
# With trunk stable, VNDK will not be frozen but deprecated. # This is the definition of the VNDK version for the current VNDK libraries.
# This version will be removed with the VNDK deprecation. # With trunk stable, VNDK will not be frozen but deprecated.
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) # This version will be removed with the VNDK deprecation.
ifdef RELEASE_PLATFORM_VNDK_VERSION ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_VNDK_VERSION := $(RELEASE_PLATFORM_VNDK_VERSION) ifdef RELEASE_PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION := $(RELEASE_PLATFORM_VNDK_VERSION)
else
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION)
endif
else else
PLATFORM_VNDK_VERSION := $(PLATFORM_SDK_VERSION) PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif endif
else
PLATFORM_VNDK_VERSION := $(PLATFORM_VERSION_CODENAME)
endif endif
.KATI_READONLY := PLATFORM_VNDK_VERSION
endif endif
.KATI_READONLY := PLATFORM_VNDK_VERSION
ifndef PLATFORM_SYSTEMSDK_MIN_VERSION ifndef PLATFORM_SYSTEMSDK_MIN_VERSION
# This is the oldest version of system SDK that the platform supports. Contrary # This is the oldest version of system SDK that the platform supports. Contrary

2
target/board/BoardConfigMainlineCommon.mk
View file

@ -21,8 +21,10 @@ BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
# the devices with metadata parition # the devices with metadata parition
BOARD_USES_METADATA_PARTITION := true BOARD_USES_METADATA_PARTITION := true
ifeq ($(KEEP_VNDK),true)
# Default is current, but allow devices to override vndk version if needed. # Default is current, but allow devices to override vndk version if needed.
BOARD_VNDK_VERSION ?= current BOARD_VNDK_VERSION ?= current
endif
# 64 bit mediadrmserver # 64 bit mediadrmserver
TARGET_ENABLE_MEDIADRM_64 := true TARGET_ENABLE_MEDIADRM_64 := true

19
target/product/gsi/Android.mk
View file

@ -7,6 +7,7 @@ INTERNAL_VNDK_LIB_LIST := $(SOONG_VNDK_LIBRARIES_FILE)
##################################################################### #####################################################################
# This is the up-to-date list of vndk libs. # This is the up-to-date list of vndk libs.
LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt LATEST_VNDK_LIB_LIST := $(LOCAL_PATH)/current.txt
ifeq ($(KEEP_VNDK),true)
UNFROZEN_VNDK := true UNFROZEN_VNDK := true
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
# Use frozen vndk lib list only if "34 >= PLATFORM_VNDK_VERSION" # Use frozen vndk lib list only if "34 >= PLATFORM_VNDK_VERSION"
@ -18,6 +19,7 @@ ifeq (REL,$(PLATFORM_VERSION_CODENAME))
UNFROZEN_VNDK := UNFROZEN_VNDK :=
endif endif
endif endif
endif
##################################################################### #####################################################################
# Check the generate list against the latest list stored in the # Check the generate list against the latest list stored in the
@ -35,6 +37,8 @@ ifeq ($(TARGET_IS_64_BIT)|$(TARGET_2ND_ARCH),true|)
check-vndk-list: ; check-vndk-list: ;
else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true) else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)
check-vndk-list: ; check-vndk-list: ;
else ifeq ($(BOARD_VNDK_VERSION),)
check-vndk-list: ;
else else
check-vndk-list: $(check-vndk-list-timestamp) check-vndk-list: $(check-vndk-list-timestamp)
ifneq ($(SKIP_ABI_CHECKS),true) ifneq ($(SKIP_ABI_CHECKS),true)
@ -199,25 +203,14 @@ endif
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
_vndk_versions :=
ifeq ($(filter com.android.vndk.current.on_vendor, $(PRODUCT_PACKAGES)),)
_vndk_versions += $(if $(call math_is_number,$(PLATFORM_VNDK_VERSION)),\
$(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),\
$(if $(call math_lt,$(vndk_ver),$(PLATFORM_VNDK_VERSION)),$(vndk_ver))),\
$(PRODUCT_EXTRA_VNDK_VERSIONS))
endif
ifneq ($(BOARD_VNDK_VERSION),current)
_vndk_versions += $(BOARD_VNDK_VERSION)
endif
LOCAL_MODULE := vndk_apex_snapshot_package LOCAL_MODULE := vndk_apex_snapshot_package
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(_vndk_versions),com.android.vndk.v$(vndk_ver)) LOCAL_REQUIRED_MODULES := $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver))
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
_vndk_versions :=
##################################################################### #####################################################################
# Define Phony module to install LLNDK modules which are installed in # Define Phony module to install LLNDK modules which are installed in
# the system image # the system image