diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-08 01:15:08 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-08 02:13:53 +0000 |
| commit | 58bb500dfb6a8899f77eb2871fa49f7fbee093d9 (patch) | |
| tree | ab233b78eaddc2c52a0c01fe773fe3c51f95aa50 | |
| parent | 392b0ef046f161c2779367a91d4147d754c49f81 (diff) | |
| parent | b3b72e8910f123a0708752ed9d1dfb08dc57b966 (diff) | |
| download | build-58bb500dfb6a8899f77eb2871fa49f7fbee093d9.tar.gz | |
Make change and version bump to aml_ads_331710000 for mainline module file: None
Snap for 9706066 from b3b72e8910f123a0708752ed9d1dfb08dc57b966 to mainline-adservices-release
Change-Id: Ide82e7577eaccc711978107a76be590f95094733
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 20 |
3 files changed, 18 insertions, 8 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 19365ec3ba..b06e3bdec7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=331611000 +BUILD_ID=331710000 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8ff52bef57..3df3fb3663 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -78,7 +78,7 @@ endif .KATI_READONLY := PLATFORM_SDK_VERSION # This is the sdk extension version of this tree. -PLATFORM_SDK_EXTENSION_VERSION := 5 +PLATFORM_SDK_EXTENSION_VERSION := 6 .KATI_READONLY := PLATFORM_SDK_EXTENSION_VERSION # This is the sdk extension version that PLATFORM_SDK_VERSION ships with. @@ -103,7 +103,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2023-03-01 + PLATFORM_SECURITY_PATCH := 2023-04-01 endif include $(BUILD_SYSTEM)/version_util.mk diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 418d8daa85..ec49b0d36f 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -2309,12 +2309,22 @@ def GetMinSdkVersionInt(apk_name, codename_to_api_level_map): try: return int(version) except ValueError: - # Not a decimal number. Codename? - if version in codename_to_api_level_map: - return codename_to_api_level_map[version] + # Not a decimal number. + # + # It could be either a straight codename, e.g. + # UpsideDownCake + # + # Or a codename with API fingerprint SHA, e.g. + # UpsideDownCake.e7d3947f14eb9dc4fec25ff6c5f8563e + # + # Extract the codename and try and map it to a version number. + split = version.split(".") + codename = split[0] + if codename in codename_to_api_level_map: + return codename_to_api_level_map[codename] raise ExternalError( - "Unknown minSdkVersion: '{}'. Known codenames: {}".format( - version, codename_to_api_level_map)) + "Unknown codename: '{}' from minSdkVersion: '{}'. Known codenames: {}".format( + codename, version, codename_to_api_level_map)) def SignFile(input_name, output_name, key, password, min_api_level=None, |