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

Commit 567531bc authored Mar 13, 2025 by Treehugger Robot Committed by Automerger Merge Worker Mar 13, 2025

Merge "Remove BUILDING_WITH_VSDK code paths" into main am: 519f7566

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>

parents 7d6ec980 519f7566

core/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -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))

core/config.mk

+1 −4

Original line number	Diff line number	Diff line
		@@ -598,11 +598,8 @@ 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
		endif
		ifeq (true,$(TARGET_BUILD_UNBUNDLED))
		ifneq (true,$(UNBUNDLED_BUILD_SDKS_FROM_SOURCE))
		TARGET_BUILD_USE_PREBUILT_SDKS := true