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/package.mk | |
| 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/package.mk')
| -rw-r--r-- | core/package.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/package.mk b/core/package.mk index e79059a..7bc5be4 100644 --- a/core/package.mk +++ b/core/package.mk @@ -299,20 +299,20 @@ endif # Secure release builds will have their packages signed after the fact, # so it's ok for these private keys to be in the clear. ifeq ($(LOCAL_CERTIFICATE),) - LOCAL_CERTIFICATE := testkey + LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) endif ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) # The special value "EXTERNAL" means that we will sign it with the - # default testkey, apply predexopt, but then expect the final .apk + # default devkey, apply predexopt, but then expect the final .apk # (after dexopting) to be signed by an outside tool. - LOCAL_CERTIFICATE := testkey + LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) PACKAGES.$(LOCAL_PACKAGE_NAME).EXTERNAL_KEY := 1 endif # If this is not an absolute certificate, assign it to a generic one. ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) - LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE) + LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) endif private_key := $(LOCAL_CERTIFICATE).pk8 certificate := $(LOCAL_CERTIFICATE).x509.pem |