diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-01 08:04:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-01 09:02:24 +0000 |
| commit | a97c55df5656cf9378a0f49405e51431cad88562 (patch) | |
| tree | e78b95f1b5c764a274e3a3240421a3957ec5f89f | |
| parent | ceb9022bf5a3092c856a20b2e9107d242da95e6c (diff) | |
| parent | ff6bc088a517b9bb4d57be27268c5d34db43ae86 (diff) | |
| download | build-a97c55df5656cf9378a0f49405e51431cad88562.tar.gz | |
Make change and version bump to aml_cbr_331610000 for mainline module file: None
Snap for 9549188 from ff6bc088a517b9bb4d57be27268c5d34db43ae86 to mainline-cellbroadcast-release
Change-Id: I2bd2660317da9c24badd00c272c4826a1dc4d5f0
| -rw-r--r-- | core/OWNERS | 2 | ||||
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/tasks/sts-lite.mk | 3 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/module_common.mk | 5 | ||||
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks.py | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/core/OWNERS b/core/OWNERS index 8794434f7b..8d612e02d5 100644 --- a/core/OWNERS +++ b/core/OWNERS @@ -2,5 +2,5 @@ per-file dex_preopt*.mk = ngeoffray@google.com,calin@google.com,mathewi@google.c per-file verify_uses_libraries.sh = ngeoffray@google.com,calin@google.com,skvadrik@google.com # For version updates -per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com,lubomir@google.com,pscovanner@google.com +per-file version_defaults.mk = aseaton@google.com,lubomir@google.com,pscovanner@google.com,bkhalife@google.com,jainne@google.com diff --git a/core/build_id.mk b/core/build_id.mk index fde6a84872..aca1abbe59 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=331510000 +BUILD_ID=331610000 diff --git a/core/tasks/sts-lite.mk b/core/tasks/sts-lite.mk index dee25d4802..65c65c3dc6 100644 --- a/core/tasks/sts-lite.mk +++ b/core/tasks/sts-lite.mk @@ -29,7 +29,8 @@ $(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples) $(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \ -x android-sts-lite/tools/sts-tradefed-tests.jar \ 'android-sts-lite/tools/*:sts-test/libs/' \ - 'android-sts-lite/testcases/*:sts-test/utils/' + 'android-sts-lite/testcases/*:sts-test/utils/' \ + 'android-sts-lite/jdk/**/*:sts-test/jdk/' $(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES) rm -f $(STS_LITE_ZIP)_filtered diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 58758eb137..8ff52bef57 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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-02-01 + PLATFORM_SECURITY_PATCH := 2023-03-01 endif include $(BUILD_SYSTEM)/version_util.mk diff --git a/target/product/module_common.mk b/target/product/module_common.mk index 54f3949965..ec670ee4c9 100644 --- a/target/product/module_common.mk +++ b/target/product/module_common.mk @@ -25,3 +25,8 @@ PRODUCT_SHIPPING_API_LEVEL := 29 # Builds using a module product should build modules from source, even if # BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE says otherwise. PRODUCT_MODULE_BUILD_FROM_SOURCE := true + +# Build sdk from source if the branch is not using slim manifests. +ifneq (,$(strip $(wildcard frameworks/base/Android.bp))) + UNBUNDLED_BUILD_SDKS_FROM_SOURCE := true +endif diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index 837eaf9c1e..09d0b10a42 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -1032,7 +1032,7 @@ def ReplaceVerityKeyId(input_zip, output_zip, key_path): keyid, stderr = p.communicate() assert p.returncode == 0, "Failed to dump certificate: {}".format(stderr) keyid = re.search( - r'keyid:([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() + r'Authority Key Identifier:\s*(?:keyid:)?([0-9a-fA-F:]*)', keyid).group(1).replace(':', '').lower() print("Replacing verity keyid with {}".format(keyid)) out_buffer.append("veritykeyid=id:%s" % (keyid,)) |