diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-30 05:27:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-30 06:26:50 +0000 |
| commit | e8f4df8675562dd9e5efbcc7299f08760a34c5fe (patch) | |
| tree | 08371e02ac343905b3bd38c22ea031ce676e61c6 | |
| parent | d525f94312df63a8e746fcb6623bcc82fff44182 (diff) | |
| parent | e20777e6a7155d7923c8bfbf0e745a96307706d1 (diff) | |
| download | build-e8f4df8675562dd9e5efbcc7299f08760a34c5fe.tar.gz | |
Make change and version bump to aml_cbr_331810000 for mainline module file: Noneaml_cbr_331810000
Snap for 9847922 from e20777e6a7155d7923c8bfbf0e745a96307706d1 to mainline-cellbroadcast-release
Change-Id: Idda5b3acc8b61286add73784f23b68b84dae8fa3
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/tasks/tools/compatibility.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index b06e3bdec7..cc2990cad0 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=331710000 +BUILD_ID=331810000 diff --git a/core/tasks/tools/compatibility.mk b/core/tasks/tools/compatibility.mk index 4b8bd16c2e..cfae490c30 100644 --- a/core/tasks/tools/compatibility.mk +++ b/core/tasks/tools/compatibility.mk @@ -30,7 +30,6 @@ test_suite_subdir := android-$(test_suite_name) out_dir := $(HOST_OUT)/$(test_suite_name)/$(test_suite_subdir) test_artifacts := $(COMPATIBILITY.$(test_suite_name).FILES) test_tools := $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \ - $(HOST_OUT_JAVA_LIBRARIES)/tradefed-no-fwk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/tradefed-test-framework.jar \ $(HOST_OUT_JAVA_LIBRARIES)/loganalysis.jar \ $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 649032b60f..afdc61f40b 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-04-01 + PLATFORM_SECURITY_PATCH := 2023-05-01 endif include $(BUILD_SYSTEM)/version_util.mk |