core: Drop support for BOARD_PREBUILT_PVMFWIMAGE
Remove the variable as it was only used when the prebuilt was device-specific but pvmfw is now part of AOSP. Bug: 237371962 Test: m $(realpath --relative-to=. $ANDROID_PRODUCT_OUT/pvmfw.img) Change-Id: I5b4c1ffd563e3dccf22ee485cb12866355f5bfe0
This commit is contained in:
parent
085a34b963
commit
cb1d31c43b
3 changed files with 2 additions and 13 deletions
|
@ -3909,15 +3909,9 @@ endif # BOARD_PREBUILT_DTBOIMAGE
|
||||||
ifeq ($(BOARD_USES_PVMFWIMAGE),true)
|
ifeq ($(BOARD_USES_PVMFWIMAGE),true)
|
||||||
INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img
|
INSTALLED_PVMFWIMAGE_TARGET := $(PRODUCT_OUT)/pvmfw.img
|
||||||
INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET := $(PRODUCT_OUT)/pvmfw_embedded.avbpubkey
|
INSTALLED_PVMFW_EMBEDDED_AVBKEY_TARGET := $(PRODUCT_OUT)/pvmfw_embedded.avbpubkey
|
||||||
INTERNAL_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
|
PREBUILT_PVMFWIMAGE_TARGET := packages/modules/Virtualization/pvmfw/pvmfw.img
|
||||||
INTERNAL_PVMFW_EMBEDDED_AVBKEY := external/avb/test/data/testkey_rsa4096_pub.bin
|
INTERNAL_PVMFW_EMBEDDED_AVBKEY := external/avb/test/data/testkey_rsa4096_pub.bin
|
||||||
|
|
||||||
ifdef BOARD_PREBUILT_PVMFWIMAGE
|
|
||||||
PREBUILT_PVMFWIMAGE_TARGET := $(BOARD_PREBUILT_PVMFWIMAGE)
|
|
||||||
else
|
|
||||||
PREBUILT_PVMFWIMAGE_TARGET := $(INTERNAL_PREBUILT_PVMFWIMAGE)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||||
$(INSTALLED_PVMFWIMAGE_TARGET): $(PREBUILT_PVMFWIMAGE_TARGET) $(AVBTOOL) $(BOARD_AVB_PVMFW_KEY_PATH)
|
$(INSTALLED_PVMFWIMAGE_TARGET): $(PREBUILT_PVMFWIMAGE_TARGET) $(AVBTOOL) $(BOARD_AVB_PVMFW_KEY_PATH)
|
||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
|
@ -931,9 +931,6 @@ endif
|
||||||
.KATI_READONLY := BUILDING_SYSTEM_DLKM_IMAGE
|
.KATI_READONLY := BUILDING_SYSTEM_DLKM_IMAGE
|
||||||
|
|
||||||
BOARD_USES_PVMFWIMAGE :=
|
BOARD_USES_PVMFWIMAGE :=
|
||||||
ifdef BOARD_PREBUILT_PVMFWIMAGE
|
|
||||||
BOARD_USES_PVMFWIMAGE := true
|
|
||||||
endif
|
|
||||||
ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true)
|
ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true)
|
||||||
BOARD_USES_PVMFWIMAGE := true
|
BOARD_USES_PVMFWIMAGE := true
|
||||||
endif
|
endif
|
||||||
|
@ -943,9 +940,6 @@ BUILDING_PVMFW_IMAGE :=
|
||||||
ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true)
|
ifeq ($(PRODUCT_BUILD_PVMFW_IMAGE),true)
|
||||||
BUILDING_PVMFW_IMAGE := true
|
BUILDING_PVMFW_IMAGE := true
|
||||||
endif
|
endif
|
||||||
ifdef BOARD_PREBUILT_PVMFWIMAGE
|
|
||||||
BUILDING_PVMFW_IMAGE :=
|
|
||||||
endif
|
|
||||||
.KATI_READONLY := BUILDING_PVMFW_IMAGE
|
.KATI_READONLY := BUILDING_PVMFW_IMAGE
|
||||||
|
|
||||||
###########################################
|
###########################################
|
||||||
|
|
|
@ -165,6 +165,7 @@ $(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY,VB 1.0 and related variables are no
|
||||||
$(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY_FEC,VB 1.0 and related variables are no longer supported)
|
$(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY_FEC,VB 1.0 and related variables are no longer supported)
|
||||||
$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)
|
$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)
|
||||||
$(KATI_obsolete_var PRODUCT_VERITY_SIGNING_KEY,VB 1.0 and related variables are no longer supported)
|
$(KATI_obsolete_var PRODUCT_VERITY_SIGNING_KEY,VB 1.0 and related variables are no longer supported)
|
||||||
|
$(KATI_obsolete_var BOARD_PREBUILT_PVMFWIMAGE,pvmfw.bin is now built in AOSP and custom versions are no longer supported)
|
||||||
# Used to force goals to build. Only use for conditionally defined goals.
|
# Used to force goals to build. Only use for conditionally defined goals.
|
||||||
.PHONY: FORCE
|
.PHONY: FORCE
|
||||||
FORCE:
|
FORCE:
|
||||||
|
|
Loading…
Reference in a new issue