Fix handling of version codes in minSdkVersion when signing.

am: f59ad14c1f

* commit 'f59ad14c1f7cb07a4669741f8b0bb1e938398eca':
  Fix handling of version codes in minSdkVersion when signing.

Change-Id: Ie53be2528b32bc2eaa70645000ad66473422e06f
This commit is contained in:
Alex Klyubin 2016-05-11 21:56:43 +00:00 committed by android-build-merger
commit 8a86f9ea4d
1 changed files with 5 additions and 1 deletions

View File

@ -2526,10 +2526,14 @@ endef
# decimal number) instead. If the APK does not specify a minSdkVersion, returns
# 0 to match how the Android platform interprets this situation at runtime.
#
# This currently substitutes any version which contains characters other than
# digits with the current platform's API Level number. This is because I
# couldn't figure out an easy way to perform the substitution only for the
# version codes listed in PLATFORM_VERSION_ALL_CODENAMES.
define get-package-min-sdk-version-int
$$(($(AAPT) dump badging $(1) 2>&1 | grep '^sdkVersion' || echo "sdkVersion:'0'") \
| cut -d"'" -f2 | \
sed -e s/^$(PLATFORM_VERSION_CODENAME)$$/$(PLATFORM_SDK_VERSION)/)
sed -e s/^.*[^0-9].*$$/$(PLATFORM_SDK_VERSION)/)
endef
# Sign a package using the specified key/cert.