| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-12 10:16:03 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-09-12 10:16:03 (GMT) |
| commit | 5e532abab195b7d913952287649e3f4b8dafdb71 (patch) | |
| tree | 1cec1a81d669970800fd288b60bda2e364aa7386 | |
| parent | 65d737dae4ffac32669a13ac071a181cd2b49d90 (diff) | |
| parent | 90660f735703a0bd1f9cb8c10d09a8cb3bc0fe79 (diff) | |
| download | common-5e532abab195b7d913952287649e3f4b8dafdb71.zip common-5e532abab195b7d913952287649e3f4b8dafdb71.tar.gz common-5e532abab195b7d913952287649e3f4b8dafdb71.tar.bz2 | |
Merge "build: use absolute address & do not build from source default [1/1]" into p-tv-dev
| -rw-r--r-- | factory.mk | 33 |
1 files changed, 23 insertions, 10 deletions
@@ -335,27 +335,40 @@ ifeq ($(PRODUCT_AML_SECURE_BOOT_VERSION3),true) BOOTLOADER_INPUT := $(BOOTLOADER_INPUT).zip endif #ifeq ($(PRODUCT_AML_SECURE_BOOT_VERSION3),true) endif # ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) + + +ANDROID_HOME_DIR = $(shell pwd) +ifneq ($(wildcard bootloader/uboot-repo/*),) +BOOTLOADER_DIR := $(ANDROID_HOME_DIR)/bootloader/uboot-repo +else +ifneq ($(wildcard ~/bootloader/.*),) +BOOTLOADER_DIR := ~/bootloader/uboot-repo +endif +endif + ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET): build_always # Google internal tree might not have the bootloader source +ifeq ($(PRODUCT_BUILD_AML_BOOTLOADER),true) ifneq ($(wildcard ~/bootloader/.* bootloader/uboot-repo/*),) ifeq ($(TARGET_DEVICE),sabrina) - cd bootloader/uboot-repo && \ - ./mk sm1_sabrina_v1 --bl32 bl32/bin/g12a/bl32.img --systemroot --avb2 + cd $(BOOTLOADER_DIR) && \ + ./mk sm1_sabrina_v1 --bl32 $(BOOTLOADER_DIR)/bl32/bin/g12a/bl32.img --systemroot --avb2 else ifeq ($(TARGET_DEVICE),deadpool) - cd bootloader/uboot-repo && \ - ./mk g12a_deadpool_v1 --bl32 ../../vendor/amlogic/common/tdk/secureos/g12a/bl32.img --systemroot --avb2 + cd $(BOOTLOADER_DIR) && \ + ./mk g12a_deadpool_v1 --bl32 $(ANDROID_HOME_DIR)/vendor/amlogic/common/tdk/secureos/g12a/bl32.img --systemroot --avb2 +endif endif + cp $(ANDROID_HOME_DIR)/bootloader/uboot-repo/fip/_tmp/bl2_new.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ + cp $(ANDROID_HOME_DIR)/bootloader/uboot-repo/fip/_tmp/bl30_new.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ + cp $(ANDROID_HOME_DIR)/bootloader/uboot-repo/fip/_tmp/bl31.img $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ + cp $(ANDROID_HOME_DIR)/bootloader/uboot-repo/fip/_tmp/bl32.img $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ + cp $(ANDROID_HOME_DIR)/bootloader/uboot-repo/fip/_tmp/bl33.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ endif - cp bootloader/uboot-repo/fip/_tmp/bl2_new.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ - cp bootloader/uboot-repo/fip/_tmp/bl30_new.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ - cp bootloader/uboot-repo/fip/_tmp/bl31.img $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ - cp bootloader/uboot-repo/fip/_tmp/bl32.img $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ - cp bootloader/uboot-repo/fip/_tmp/bl33.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ endif - bash $(PRODUCT_GOOGLEREF_SECURE_BOOT_TOOL) + bash $(ANDROID_HOME_DIR)/$(PRODUCT_GOOGLEREF_SECURE_BOOT_TOOL) mkdir -p $(PRODUCT_OUT)/upgrade/ cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.signed $(PRODUCT_OUT)/bootloader.img.encrypt cp $(TARGET_DEVICE_DIR)/prebuilt/bootloader/u-boot.bin.signed $(PRODUCT_OUT)/upgrade/bootloader.img.encrypt |