diff options
| author | Doug Zongker <dougz@android.com> | 2011-03-16 11:17:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 11:17:24 -0700 |
| commit | 095dbffd605eb1bb602b028000aab4494288c6f6 (patch) | |
| tree | e7e7af421feab9a592a2d4a3ff6f9360e31cfd48 /core/Makefile | |
| parent | 3c6a62a329fd818a4d57250811686a740690d798 (diff) | |
| parent | 5d4808db1630048f6eb0610b75af01c9fc877412 (diff) | |
| download | build-095dbffd605eb1bb602b028000aab4494288c6f6.zip build-095dbffd605eb1bb602b028000aab4494288c6f6.tar.gz build-095dbffd605eb1bb602b028000aab4494288c6f6.tar.bz2 | |
am 5d4808db: put extra recovery keys in the product definition
* commit '5d4808db1630048f6eb0610b75af01c9fc877412':
put extra recovery keys in the product definition
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 68905ac..02f1741 100644 --- a/core/Makefile +++ b/core/Makefile @@ -654,7 +654,7 @@ RECOVERY_INSTALL_OTA_KEYS := \ $(call intermediates-dir-for,PACKAGING,ota_keys)/keys DUMPKEY_JAR := $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar $(RECOVERY_INSTALL_OTA_KEYS): PRIVATE_OTA_PUBLIC_KEYS := $(OTA_PUBLIC_KEYS) -$(RECOVERY_INSTALL_OTA_KEYS): extra_keys := $(patsubst %,%.x509.pem,$(TARGET_EXTRA_RECOVERY_KEYS)) +$(RECOVERY_INSTALL_OTA_KEYS): extra_keys := $(patsubst %,%.x509.pem,$(PRODUCT_EXTRA_RECOVERY_KEYS)) $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) @echo "DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)" @rm -rf $@ @@ -1068,8 +1068,8 @@ endif ifdef INTERNAL_USERIMAGES_SPARSE_EXT_FLAG $(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(zip_root)/META/misc_info.txt endif -ifdef TARGET_EXTRA_RECOVERY_KEYS - $(hide) echo "extra_recovery_keys=$(TARGET_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt +ifdef PRODUCT_EXTRA_RECOVERY_KEYS + $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt endif @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) |