diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-05 00:22:14 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-05 01:19:20 +0000 |
| commit | dfa77104ebf1bd4906c40a23952fc7dcf822bff8 (patch) | |
| tree | 74a990d2ee1dbf246659e67ea50ce34109087d85 | |
| parent | 23f0b866d6f9ba188f30a64d3612ec12863d20c0 (diff) | |
| parent | b3300a79f60d3d9d1b228286a9554ad194632691 (diff) | |
| download | build-dfa77104ebf1bd4906c40a23952fc7dcf822bff8.tar.gz | |
Make change and version bump to aml_sta_331810000 for mainline module file: None
Snap for 9884511 from b3300a79f60d3d9d1b228286a9554ad194632691 to mainline-os-statsd-release
Change-Id: I272ab7fecf05ee86ac67d2dd6a8d8a066c5dd9a5
| -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 55b5523cb6..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=331711000 +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 3df3fb3663..de01c3ac7e 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 |