From 890891ed7543a846b1d1eb5ed95c1f96044754bd Mon Sep 17 00:00:00 2001 From: Marielos Guerra Date: Thu, 1 Jun 2023 18:21:48 +0000 Subject: DO NOT MERGE: Drop prebuilt files to android source tree. The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_annotations.h current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_buffer_writer.h current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_socket.h current/x86/lib/libstatssocket.so current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv current/java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar current/x86_64/lib/libstatssocket.so current/arm/lib/libstatssocket.so current/licenses/build/soong/licenses/LICENSE current/arm64/lib/libstatssocket.so current/sdk_library/public/framework-statsd-removed.txt current/sdk_library/public/framework-statsd-stubs.jar current/sdk_library/public/framework-statsd.srcjar current/sdk_library/public/framework-statsd.txt current/sdk_library/public/framework-statsd_annotations.zip current/sdk_library/module-lib/framework-statsd-removed.txt current/sdk_library/module-lib/framework-statsd-stubs.jar current/sdk_library/module-lib/framework-statsd.srcjar current/sdk_library/module-lib/framework-statsd.txt current/sdk_library/module-lib/framework-statsd_annotations.zip current/sdk_library/system/framework-statsd-removed.txt current/sdk_library/system/framework-statsd-stubs.jar current/sdk_library/system/framework-statsd.srcjar current/sdk_library/system/framework-statsd.txt current/sdk_library/system/framework-statsd_annotations.zip Built here: ab/T1006563 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 272106880 Change-Id: If7efed9e2bb11352b983aad863ea2dba9ca7708a --- .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 2 +- current/Android.bp | 6 ++++++ current/snapshot-creation-build-number.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index a193909..a4e2c82 100644 --- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb +++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "T1005628" + build_id: "T1006563" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip" } diff --git a/current/Android.bp b/current/Android.bp index 879b615..dd6061d 100644 --- a/current/Android.bp +++ b/current/Android.bp @@ -1,5 +1,11 @@ // This is auto-generated. DO NOT EDIT. +// blueprint rules added by vendor/google/build/mainline_modules_sdks.py +// to support coexistence. +blueprint_package_includes { + match_all: ["com.android.mainline"] +} + package { // A default list here prevents the license LSC from adding its own list which would // be unnecessary as every module in the sdk already has its own licenses property. diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 26342c0..fca0988 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -9264397 \ No newline at end of file +9832152 \ No newline at end of file -- cgit v1.2.3