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

Commit 519f7566 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove BUILDING_WITH_VSDK code paths" into main

parents 3438181b 142a8084

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