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

Commit 1e14cdfd authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION 

Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION if VNDK is
deprecated. BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION should not be
used once VNDK is deprecated with KEEP_VNDK=false

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: Iead60663bed3653e63e7a444a873cfaea50780b0
parent dc7efff9

core/board_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -965,12 +965,15 @@ define check_vndk_version 
  $(if $(wildcard $(vndk_path)/*/Android.bp),,$(error VNDK version $(1) not found))

endef



ifeq ($(KEEP_VNDK),true)

ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))

  $(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current)

endif

ifneq ($(BOARD_VNDK_VERSION),current)

  $(call check_vndk_version,$(BOARD_VNDK_VERSION))

endif

endif



TARGET_VENDOR_TEST_SUFFIX := /vendor



ifeq (,$(TARGET_BUILD_UNBUNDLED))

core/config.mk

+20 −15
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ 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
@@ -383,6 +384,8 @@ ifndef BOARD_VNDK_VERSION 
  BOARD_VNDK_VERSION := current

  # READ WARNING - DO NOT CHANGE

  endif

endif





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

# Define most of the global variables.  These are the ones that
@@ -813,13 +816,6 @@ $(KATI_obsolete_var $(foreach req,$(requirements),$(req)_OVERRIDE) \ 


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

# partitions is supported. But the early-mount must be supported for full

# 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



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 (,$(SYSTEM_OPTIMIZE_JAVA))

$(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled)

core/envsetup.mk

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ endef 
# Release config

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

include $(BUILD_SYSTEM)/version_util.mk

core/main.mk

+2 −8
Original line number Diff line number Diff line
@@ -225,20 +225,14 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.postinstall.fstab.prefix=/system 
# ADDITIONAL_VENDOR_PROPERTIES will be installed in vendor/build.prop if

# property_overrides_split_enabled is true. Otherwise it will be installed in

# /system/build.prop

ifdef BOARD_VNDK_VERSION

ifeq ($(KEEP_VNDK),true)

ifdef BOARD_VNDK_VERSION

  ifeq ($(BOARD_VNDK_VERSION),current)

    ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(PLATFORM_VNDK_VERSION)

  else

    ADDITIONAL_VENDOR_PROPERTIES := ro.vndk.version=$(BOARD_VNDK_VERSION)

  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



# Add cpu properties for bionic and ART.

core/soong_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -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_list, DeviceKernelHeaders,               $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) $(TARGET_PRODUCT_KERNEL_HEADERS))

$(call add_json_str,  VendorApiLevel,                    $(BOARD_API_LEVEL))

ifeq ($(KEEP_VNDK),true)

$(call add_json_str,  DeviceVndkVersion,                 $(BOARD_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, DeviceSystemSdkVersions,           $(BOARD_SYSTEMSDK_VERSIONS))

$(call add_json_str,  RecoverySnapshotVersion,           $(RECOVERY_SNAPSHOT_VERSION))