StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily" am: 1a95fc381c am: 4bfbb5f713 am: 014b99ee06

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1966606

Change-Id: If6006d3a8a20f5f52c0d31eff06d42ecc377fb53
This commit is contained in:
Baligh Uddin
2022-02-01 20:39:48 +00:00
committed by Automerger Merge Worker
parent 538e709690 014b99ee06
commit f9723ff858
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/Makefile
View File

@@ -3647,7 +3647,7 @@ INTERNAL_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
ifdef BOARD_PREBUILT_PVMFWIMAGE
PREBUILT_PVMFWIMAGE_TARGET := $(BOARD_PREBUILT_PVMFWIMAGE)
else ifeq ($(BUILDING_PVMFW_IMAGE),true)
else
PREBUILT_PVMFWIMAGE_TARGET := $(INTERNAL_PREBUILT_PVMFWIMAGE)
endif
@@ -5542,12 +5542,9 @@ ifdef BOARD_PREBUILT_DTBOIMAGE
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
endif # BOARD_PREBUILT_DTBOIMAGE
ifdef BOARD_PREBUILT_PVMFWIMAGE
ifeq ($(BOARD_USES_PVMFWIMAGE),true)
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
else ifeq ($(BUILDING_PVMFW_IMAGE),true)
$(hide) mkdir -p $(zip_root)/IMAGES
$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/IMAGES/
endif
ifdef BOARD_PREBUILT_BOOTLOADER
$(hide) mkdir -p $(zip_root)/IMAGES