diff options
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/envsetup.mk | 7 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 3 |
4 files changed, 0 insertions, 14 deletions
diff --git a/core/config.mk b/core/config.mk index ce11b1d558..0db2d7ff53 100644 --- a/core/config.mk +++ b/core/config.mk @@ -1248,14 +1248,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)) diff --git a/core/envsetup.mk b/core/envsetup.mk index 3271079abc..c258dad09c 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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 diff --git a/core/soong_config.mk b/core/soong_config.mk index 7402d2b0ed..475fe98b91 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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, 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)) diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 5044a39184..da1284e7b8 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -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 \ |