diff options
| author | Doug Zongker <dougz@android.com> | 2011-10-05 13:06:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-05 13:06:30 -0700 |
| commit | 68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0 (patch) | |
| tree | 189dde5d5d13ec4c82583c8081bb4161c95435b0 /core | |
| parent | f41e67d82fd7bac695ecb0fbd70723c704a0aa9d (diff) | |
| parent | 49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e (diff) | |
| download | build-68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0.zip build-68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0.tar.gz build-68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0.tar.bz2 | |
am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
fix build fingerprint: dev-keys vs test-keys
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index eb4c762..a81c981 100644 --- a/core/Makefile +++ b/core/Makefile @@ -77,9 +77,16 @@ BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS) ifeq ($(TARGET_BUILD_TYPE),debug) BUILD_VERSION_TAGS += debug endif -# 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. +# The "test-keys" tag marks builds signed with the old test keys, +# which are available in the SDK. "dev-keys" marks builds signed with +# non-default dev keys (usually private keys from a vendor directory). +# Both of these tags will be removed and replaced with "release-keys" +# when the target-files is signed in a post-build step. +ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey) +BUILD_VERSION_TAGS += test-keys +else BUILD_VERSION_TAGS += dev-keys +endif BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) # A human-readable string that descibes this build in detail. |