diff options
| author | Ying Wang <wangying@google.com> | 2011-10-04 10:50:08 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-10-04 10:50:08 -0700 |
| commit | 3c21fe5b12d95fe374b9b8c874dc4c48b7f9fce1 (patch) | |
| tree | 62df898db6926f6897181aad2b716be94f7fa96d /core/Makefile | |
| parent | 6e69feed1a3d57d3206f7dabe32e06e8b07189e2 (diff) | |
| download | build-3c21fe5b12d95fe374b9b8c874dc4c48b7f9fce1.zip build-3c21fe5b12d95fe374b9b8c874dc4c48b7f9fce1.tar.gz build-3c21fe5b12d95fe374b9b8c874dc4c48b7f9fce1.tar.bz2 | |
Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index ebc8a85..3186bda 100644 --- a/core/Makefile +++ b/core/Makefile @@ -71,9 +71,9 @@ BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS) ifeq ($(TARGET_BUILD_TYPE),debug) BUILD_VERSION_TAGS += debug endif -# Apps are always signed with test keys, and may be re-signed in a post-build -# step. If that happens, the "test-keys" tag will be removed by that step. -BUILD_VERSION_TAGS += test-keys +# Apps are always signed with dev keys, and may be re-signed in a post-build +# step. If that happens, the "dev-keys" tag will be removed by that step. +BUILD_VERSION_TAGS += dev-keys BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) # A human-readable string that descibes this build in detail. @@ -258,11 +258,11 @@ endif # ----------------------------------------------------------------- -# The test key is used to sign this package, and as the key required +# The dev key is used to sign this package, and as the key required # for future OTA packages installed by this system. Actual product # deliverables will be re-signed by hand. We expect this file to # exist with the suffixes ".x509.pem" and ".pk8". -DEFAULT_KEY_CERT_PAIR := $(SRC_TARGET_DIR)/product/security/testkey +DEFAULT_KEY_CERT_PAIR := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) # Rules that need to be present for the all targets, even @@ -649,9 +649,9 @@ ifdef BOARD_KERNEL_PAGESIZE endif # Keys authorized to sign OTA packages this build will accept. The -# build always uses test-keys for this; release packaging tools will +# build always uses dev-keys for this; release packaging tools will # substitute other keys for this one. -OTA_PUBLIC_KEYS := $(SRC_TARGET_DIR)/product/security/testkey.x509.pem +OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem # Generate a file containing the keys that will be read by the # recovery binary. @@ -1097,6 +1097,7 @@ endif ifdef INTERNAL_USERIMAGES_SPARSE_EXT_FLAG $(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(zip_root)/META/misc_info.txt endif + $(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(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 |