diff options
| author | 2025-03-13 17:50:42 -0700 | |
|---|---|---|
| committer | 2025-03-13 17:50:42 -0700 | |
| commit | 567531bc05aef8c283f3a97f8e98c49adcd0ddbe (patch) | |
| tree | 0466b5bcd935e491bec1d9a66826b956d262d22b | |
| parent | 7d6ec980aacfdf51103375007799983a9933806a (diff) | |
| parent | 519f75666431ee2926e0ec8991c682b28a4c9521 (diff) | |
Merge "Remove BUILDING_WITH_VSDK code paths" into main am: 519f756664
Original change: https://android-review.googlesource.com/c/platform/build/+/3542463
Change-Id: Ida1c692b700b38f54018cc2cc5b4cde6dbf0a525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/Makefile | 3 | ||||
| -rw-r--r-- | core/config.mk | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index f4eb07a921..9db50a371c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6119,9 +6119,6 @@ endif ifneq ($(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST),) $(hide) echo "partial_ota_update_partitions_list=$(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST)" >> $@ endif -ifeq ($(BUILDING_WITH_VSDK),true) - $(hide) echo "building_with_vsdk=true" >> $@ -endif $(call declare-0p-target,$(INSTALLED_FASTBOOT_INFO_TARGET)) diff --git a/core/config.mk b/core/config.mk index 47018aaba1..fafdfe1ac3 100644 --- a/core/config.mk +++ b/core/config.mk @@ -598,10 +598,7 @@ DISABLE_PREOPT := DISABLE_PREOPT_BOOT_IMAGES := ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE)) DISABLE_PREOPT := true - # VSDK builds perform dexpreopt during merge_target_files build step. - ifneq (true,$(BUILDING_WITH_VSDK)) - DISABLE_PREOPT_BOOT_IMAGES := true - endif + DISABLE_PREOPT_BOOT_IMAGES := true endif ifeq (true,$(TARGET_BUILD_UNBUNDLED)) ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE)) |