| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-08-14 06:01:50 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-08-14 06:01:50 (GMT) |
| commit | 51fd790d7ffd0f32aa0b04c49bf32daa451142f3 (patch) | |
| tree | 9ac844c7aa67f0d522c9b7677878cded7fcd9366 | |
| parent | 42a91e6c9ca43c3d5edd4b4bff4f4230f8b7b625 (diff) | |
| parent | 217ed24a9bd8207e40d6eb982ed15147dcb2b0b7 (diff) | |
| download | common-51fd790d7ffd0f32aa0b04c49bf32daa451142f3.zip common-51fd790d7ffd0f32aa0b04c49bf32daa451142f3.tar.gz common-51fd790d7ffd0f32aa0b04c49bf32daa451142f3.tar.bz2 | |
Merge "sabrina: change Variable name [1/3]" into p-tv-dev
| -rw-r--r--[-rwxr-xr-x] | factory.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/factory.mk b/factory.mk index 9390fb0..b733478 100755..100644 --- a/factory.mk +++ b/factory.mk @@ -9,7 +9,7 @@ else BUILT_IMAGES := boot.img recovery.img dt.img endif -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) BUILT_IMAGES += bootloader.img.encrypt else BUILT_IMAGES += bootloader.img @@ -183,7 +183,7 @@ INSTALLED_AML_ENC_RADIOIMAGE_TARGET = $(addprefix $(PRODUCT_OUT)/,$(filter %.img BOARD_PACK_RADIOIMAGES += $(basename $(filter %.img.encrypt,$(BUILT_IMAGES))) $(warning echo "radio add $(filter %.img.encrypt,$(BUILT_IMAGES))") else -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) INSTALLED_RADIOIMAGE_TARGET += $(addprefix $(PRODUCT_OUT)/,$(filter dt.img bootloader.img.encrypt,$(BUILT_IMAGES))) BOARD_PACK_RADIOIMAGES += $(filter dt.img bootloader.img.encrypt,$(BUILT_IMAGES)) else @@ -227,7 +227,7 @@ ifeq ($(BUILD_WITH_AVB),true) endif PACKAGE_CONFIG_FILE := $(TARGET_DEVICE_DIR)/upgrade/$(PACKAGE_CONFIG_FILE).conf -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) PACKAGE_CONFIG_FILE := $(TARGET_DEVICE_DIR)/upgrade/aml_upgrade_package_enc_avb.conf endif @@ -310,7 +310,7 @@ INSTALLED_AMLOGIC_BOOTLOADER_TARGET := $(PRODUCT_OUT)/bootloader.img ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) INSTALLED_AMLOGIC_BOOTLOADER_TARGET := $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET).encrypt endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) INSTALLED_AMLOGIC_BOOTLOADER_TARGET := $(PRODUCT_OUT)/bootloader.img.encrypt endif .PHONY: aml_bootloader @@ -330,7 +330,7 @@ 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) -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET): build_always # Google internal tree might not have the bootloader source ifneq ($(wildcard ~/bootloader/.* bootloader/uboot-repo/*),) @@ -350,7 +350,7 @@ endif cp bootloader/uboot-repo/fip/_tmp/bl33.bin $(TARGET_DEVICE_DIR)/prebuilt/bootloader/ endif - bash $(PRODUCT_SABRINA_SECURE_BOOT_TOOL) + bash $(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 @@ -523,7 +523,7 @@ ifneq ($(TARGET_NO_RECOVERY),true) FASTBOOT_IMAGES += recovery.img endif -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) FASTBOOT_IMAGES += bootloader.img.encrypt else FASTBOOT_IMAGES += bootloader.img @@ -597,7 +597,7 @@ else cp $(PRODUCT_OUT)/bootloader.img $(PRODUCT_OUT)/fastboot_auto/ cp $(PRODUCT_OUT)/dt.img $(PRODUCT_OUT)/fastboot_auto/ endif -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) cp $(PRODUCT_OUT)/bootloader.img.encrypt $(PRODUCT_OUT)/fastboot_auto/bootloader.img endif cp $(PRODUCT_OUT)/odm.img $(PRODUCT_OUT)/fastboot_auto/ @@ -654,7 +654,7 @@ ifneq ($(INSTALLED_AMLOGIC_BOOTLOADER_TARGET),) mkdir -p $(AML_TARGET)/IMAGES cp $(INSTALLED_AMLOGIC_BOOTLOADER_TARGET) $(AML_TARGET)/IMAGES/bootloader.img endif -ifeq ($(PRODUCT_SABRINA_SECURE_BOOT),true) +ifeq ($(PRODUCT_GOOGLEREF_SECURE_BOOT),true) cp $(PRODUCT_OUT)/bootloader.img.encrypt $(AML_TARGET)/IMAGES/bootloader.img endif ifneq ($(INSTALLED_AML_LOGO),) |