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

Remove all VNDK deprecation flags

Browse source 
VNDK is fully deprecated, so flags to deprecate VNDK is no longer
needed. This change removes all flags deprecates VNDK.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ifc918a875d7d5bed232165873ee9b0c562841594
This commit is contained in:
Kiyoung Kim 2024-05-31 09:52:18 +09:00
parent 62d2ff000e
commit 69f5dbb0d0
4 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/config.mk
View file

@ -1248,14 +1248,12 @@ 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 ifdef BOARD_VNDK_VERSION
BOARD_VNDK_VERSION= BOARD_VNDK_VERSION=
endif endif
ifdef PLATFORM_VNDK_VERSION ifdef PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION= PLATFORM_VNDK_VERSION=
endif endif
endif
ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA)) ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA))
ifeq (false,$(SYSTEM_OPTIMIZE_JAVA)) ifeq (false,$(SYSTEM_OPTIMIZE_JAVA))

7
core/envsetup.mk
View file

@ -50,13 +50,6 @@ 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

2
core/soong_config.mk
View file

@ -332,8 +332,6 @@ $(call add_json_str, ReleaseAconfigFlagDefaultPermission, $(RELEASE_ACONFIG_F
$(call add_json_bool, ReleaseDefaultModuleBuildFromSource, $(RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE)) $(call add_json_bool, ReleaseDefaultModuleBuildFromSource, $(RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE))
$(call add_json_bool, KeepVndk, $(filter true,$(KEEP_VNDK)))
$(call add_json_bool, CheckVendorSeappViolations, $(filter true,$(CHECK_VENDOR_SEAPP_VIOLATIONS))) $(call add_json_bool, CheckVendorSeappViolations, $(filter true,$(CHECK_VENDOR_SEAPP_VIOLATIONS)))
$(call add_json_bool, BuildIgnoreApexContributionContents, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS)) $(call add_json_bool, BuildIgnoreApexContributionContents, $(PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS))

3
target/product/gsi_release.mk
View file

@ -58,9 +58,6 @@ ifneq ($(PRODUCT_IS_AUTOMOTIVE),true)
device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml
endif endif
# b/308878144 no more VNDK on 24Q1 and beyond
KEEP_VNDK ?= false
# Support additional VNDK snapshots # Support additional VNDK snapshots
PRODUCT_EXTRA_VNDK_VERSIONS := \ PRODUCT_EXTRA_VNDK_VERSIONS := \
30 \ 30 \