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

Commit e7a11c10 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Removes usage of TARGET_NO_VENDOR_BOOT." am: 6a93af91 am: 140548db am: 0828ddae 

Original change: https://android-review.googlesource.com/c/platform/build/+/1457443

Change-Id: I3cae59bc7c977ddcc065213e08da1a035c903bce
parents 067b104e 0828ddae

core/board_config.mk

+1 −6
Original line number Diff line number Diff line
@@ -397,12 +397,7 @@ endif 
BUILDING_VENDOR_BOOT_IMAGE :=

ifdef BOARD_BOOT_HEADER_VERSION

  ifneq ($(call math_gt_or_eq,$(BOARD_BOOT_HEADER_VERSION),3),)

    ifneq ($(TARGET_NO_VENDOR_BOOT),)

      $(warning TARGET_NO_VENDOR_BOOT has been deprecated. Please use PRODUCT_BUILD_VENDOR_BOOT_IMAGE.)

      ifneq ($(TARGET_NO_VENDOR_BOOT),true)

        BUILDING_VENDOR_BOOT_IMAGE := true

      endif

    else ifeq ($(PRODUCT_BUILD_VENDOR_BOOT_IMAGE),)

    ifeq ($(PRODUCT_BUILD_VENDOR_BOOT_IMAGE),)

      BUILDING_VENDOR_BOOT_IMAGE := true

    else ifeq ($(PRODUCT_BUILD_VENDOR_BOOT_IMAGE),true)

      BUILDING_VENDOR_BOOT_IMAGE := true

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ $(KATI_obsolete_var BOARD_VNDK_RUNTIME_DISABLE,VNDK-Lite is no longer supported. 
$(KATI_obsolete_var LOCAL_SANITIZE_BLACKLIST,Use LOCAL_SANITIZE_BLOCKLIST instead.)

$(KATI_deprecated_var BOARD_PLAT_PUBLIC_SEPOLICY_DIR,Use SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS instead.)

$(KATI_deprecated_var BOARD_PLAT_PRIVATE_SEPOLICY_DIR,Use SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS instead.)

$(KATI_obsolete_var TARGET_NO_VENDOR_BOOT,Use PRODUCT_BUILD_VENDOR_BOOT_IMAGE instead)



# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

target/board/BoardConfigEmuCommon.mk

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ else 
endif



#vendor boot

TARGET_NO_VENDOR_BOOT := false

BOARD_INCLUDE_DTB_IN_BOOTIMG := false

BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)

target/board/emulator_arm64/BoardConfig.mk

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ include build/make/target/board/BoardConfigGsiCommon.mk 
include build/make/target/board/BoardConfigEmuCommon.mk



TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := false

BOARD_USES_RECOVERY_AS_BOOT := true



BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000

target/board/generic_arm64/BoardConfig.mk

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ endif 
include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := true

BOARD_USES_RECOVERY_AS_BOOT := true



BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920