diff options
| author | Pierre-Clément Tosi <ptosi@google.com> | 2022-01-31 20:25:52 +0100 |
|---|---|---|
| committer | Pierre-Clément Tosi <ptosi@google.com> | 2022-02-01 15:06:26 +0100 |
| commit | 4bbb8dd86db28eb7ccd67d55fe299f588b064d1c (patch) | |
| tree | 3367e1598fc5de56ea8aa693d99ae925448ddd90 | |
| parent | 37aa7e48c25b0b3a55df2f3cb1e058568d911b8b (diff) | |
| download | build-4bbb8dd86db28eb7ccd67d55fe299f588b064d1c.tar.gz | |
Move pvmfw.img to PREBUILT_IMAGES temporarily
Move the image to PREBUILT_IMAGES to avoid breaking release key signing.
Bug: 216975821
Test: -
Change-Id: I686c6fec73a8383c10b17ab2af90767311cbae78
| -rw-r--r-- | core/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index 4f7eb23c40..dbd2803f40 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 |