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

Commit b20aee1b authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Remove all VNDK deprecation flags" into main

parents 62f6c088 69f5dbb0

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -1255,14 +1255,12 @@ 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 (false,$(SYSTEM_OPTIMIZE_JAVA))

core/envsetup.mk

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ 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/soong_config.mk

+0 −2
Original line number Diff line number Diff line
@@ -327,8 +327,6 @@ $(call add_json_str, ReleaseAconfigFlagDefaultPermission, $(RELEASE_ACONFIG_F 


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

target/product/gsi_release.mk

+0 −3
Original line number Diff line number Diff line
@@ -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

endif



# b/308878144 no more VNDK on 24Q1 and beyond

KEEP_VNDK ?= false



# Support additional VNDK snapshots

PRODUCT_EXTRA_VNDK_VERSIONS := \

    30 \