diff options
author | Dario Freni <dariofreni@google.com> | 2021-11-25 10:57:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-25 10:57:17 +0000 |
commit | edfad26c0c60ee8218f594e1d0033f9386486ff5 (patch) | |
tree | 54cf2882e5788dd0449ef55de0910ac6c18f92f6 | |
parent | d8e80cda9afae34a9101d9ee05d5aea6bc1d7813 (diff) | |
parent | 98ce160812495d999c360e5bbcda6cb7932703e3 (diff) | |
download | StatsD-edfad26c0c60ee8218f594e1d0033f9386486ff5.tar.gz |
DO NOT MERGE Drop prebuilt files to android source tree. am: 98ce160812
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/16321887
Change-Id: I8233389513da116bf05c4674a8ba51fcd3f6dc71
-rw-r--r-- | .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 10 | ||||
-rwxr-xr-x | current/Android.bp.auto | 213 | ||||
-rwxr-xr-x[-rw-r--r--] | current/arm/lib/libstatssocket.so | bin | 5552 -> 5552 bytes | |||
-rwxr-xr-x[-rw-r--r--] | current/arm64/lib/libstatssocket.so | bin | 13712 -> 13712 bytes | |||
-rwxr-xr-x[-rw-r--r--] | current/x86/lib/libstatssocket.so | bin | 5384 -> 5384 bytes | |||
-rwxr-xr-x[-rw-r--r--] | current/x86_64/lib/libstatssocket.so | bin | 6624 -> 6624 bytes |
6 files changed, 221 insertions, 2 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index 453f9e2..ba2e792 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: "7542407" + build_id: "7785636" target: "mainline_modules-user" source_file: "mainline-sdks/statsd-module-sdk-current.zip" } @@ -8,6 +8,12 @@ drops { version: "" version_group: "" git_project: "platform/prebuilts/module_sdk/StatsD" - git_branch: "sc-dev" + git_branch: "sc-v2-dev" transform: TRANSFORM_UNZIP + transform_options { + rename { + from_path: "Android.bp" + to_path: "Android.bp.auto" + } + } } diff --git a/current/Android.bp.auto b/current/Android.bp.auto new file mode 100755 index 0000000..3a5b72d --- /dev/null +++ b/current/Android.bp.auto @@ -0,0 +1,213 @@ +// This is auto-generated. DO NOT EDIT. + +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. + default_applicable_licenses: ["Android-Apache-2.0"], +} + +prebuilt_bootclasspath_fragment { + name: "statsd-module-sdk_com.android.os.statsd-bootclasspath-fragment@current", + sdk_member_name: "com.android.os.statsd-bootclasspath-fragment", + visibility: ["//visibility:public"], + apex_available: ["com.android.os.statsd"], + licenses: ["statsd-module-sdk_Android-Apache-2.0@current"], + contents: ["statsd-module-sdk_framework-statsd@current"], + hidden_api: { + max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"], + stub_flags: "hiddenapi/stub-flags.csv", + annotation_flags: "hiddenapi/annotation-flags.csv", + metadata: "hiddenapi/metadata.csv", + index: "hiddenapi/index.csv", + all_flags: "hiddenapi/all-flags.csv", + }, +} + +prebuilt_bootclasspath_fragment { + name: "com.android.os.statsd-bootclasspath-fragment", + prefer: false, + visibility: ["//visibility:public"], + apex_available: ["com.android.os.statsd"], + licenses: ["statsd-module-sdk_Android-Apache-2.0"], + contents: ["framework-statsd"], + hidden_api: { + max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"], + stub_flags: "hiddenapi/stub-flags.csv", + annotation_flags: "hiddenapi/annotation-flags.csv", + metadata: "hiddenapi/metadata.csv", + index: "hiddenapi/index.csv", + all_flags: "hiddenapi/all-flags.csv", + }, +} + +java_sdk_library_import { + name: "statsd-module-sdk_framework-statsd@current", + sdk_member_name: "framework-statsd", + visibility: ["//visibility:public"], + apex_available: [ + "com.android.os.statsd", + "test_com.android.os.statsd", + ], + licenses: ["statsd-module-sdk_Android-Apache-2.0@current"], + shared_library: false, + permitted_packages: [ + "android.app", + "android.os", + "android.util", + "com.android.internal.statsd", + ], + public: { + jars: ["sdk_library/public/framework-statsd-stubs.jar"], + stub_srcs: ["sdk_library/public/framework-statsd.srcjar"], + current_api: "sdk_library/public/framework-statsd.txt", + removed_api: "sdk_library/public/framework-statsd-removed.txt", + sdk_version: "module_current", + }, + system: { + jars: ["sdk_library/system/framework-statsd-stubs.jar"], + stub_srcs: ["sdk_library/system/framework-statsd.srcjar"], + current_api: "sdk_library/system/framework-statsd.txt", + removed_api: "sdk_library/system/framework-statsd-removed.txt", + sdk_version: "module_current", + }, + module_lib: { + jars: ["sdk_library/module-lib/framework-statsd-stubs.jar"], + stub_srcs: ["sdk_library/module-lib/framework-statsd.srcjar"], + current_api: "sdk_library/module-lib/framework-statsd.txt", + removed_api: "sdk_library/module-lib/framework-statsd-removed.txt", + sdk_version: "module_current", + }, +} + +java_sdk_library_import { + name: "framework-statsd", + prefer: false, + visibility: ["//visibility:public"], + apex_available: [ + "com.android.os.statsd", + "test_com.android.os.statsd", + ], + licenses: ["statsd-module-sdk_Android-Apache-2.0"], + shared_library: false, + permitted_packages: [ + "android.app", + "android.os", + "android.util", + "com.android.internal.statsd", + ], + public: { + jars: ["sdk_library/public/framework-statsd-stubs.jar"], + stub_srcs: ["sdk_library/public/framework-statsd.srcjar"], + current_api: "sdk_library/public/framework-statsd.txt", + removed_api: "sdk_library/public/framework-statsd-removed.txt", + sdk_version: "module_current", + }, + system: { + jars: ["sdk_library/system/framework-statsd-stubs.jar"], + stub_srcs: ["sdk_library/system/framework-statsd.srcjar"], + current_api: "sdk_library/system/framework-statsd.txt", + removed_api: "sdk_library/system/framework-statsd-removed.txt", + sdk_version: "module_current", + }, + module_lib: { + jars: ["sdk_library/module-lib/framework-statsd-stubs.jar"], + stub_srcs: ["sdk_library/module-lib/framework-statsd.srcjar"], + current_api: "sdk_library/module-lib/framework-statsd.txt", + removed_api: "sdk_library/module-lib/framework-statsd-removed.txt", + sdk_version: "module_current", + }, +} + +license { + name: "statsd-module-sdk_Android-Apache-2.0@current", + sdk_member_name: "Android-Apache-2.0", + visibility: ["//visibility:private"], + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["licenses/build/soong/licenses/LICENSE"], +} + +license { + name: "statsd-module-sdk_Android-Apache-2.0", + visibility: ["//visibility:private"], + license_kinds: ["SPDX-license-identifier-Apache-2.0"], + license_text: ["licenses/build/soong/licenses/LICENSE"], +} + +cc_prebuilt_library_shared { + name: "statsd-module-sdk_libstatssocket@current", + sdk_member_name: "libstatssocket", + visibility: ["//visibility:public"], + apex_available: [ + "com.android.bluetooth.updatable", + "com.android.os.statsd", + "test_com.android.os.statsd", + ], + licenses: ["statsd-module-sdk_Android-Apache-2.0@current"], + installable: false, + stl: "libc++_static", + compile_multilib: "both", + export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"], + stubs: { + versions: [ + "30", + "current", + ], + }, + arch: { + arm64: { + srcs: ["arm64/lib/libstatssocket.so"], + }, + x86_64: { + srcs: ["x86_64/lib/libstatssocket.so"], + }, + arm: { + srcs: ["arm/lib/libstatssocket.so"], + }, + x86: { + srcs: ["x86/lib/libstatssocket.so"], + }, + }, +} + +cc_prebuilt_library_shared { + name: "libstatssocket", + prefer: false, + visibility: ["//visibility:public"], + apex_available: [ + "com.android.bluetooth.updatable", + "com.android.os.statsd", + "test_com.android.os.statsd", + ], + licenses: ["statsd-module-sdk_Android-Apache-2.0"], + stl: "libc++_static", + compile_multilib: "both", + export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"], + stubs: { + versions: [ + "30", + "current", + ], + }, + arch: { + arm64: { + srcs: ["arm64/lib/libstatssocket.so"], + }, + x86_64: { + srcs: ["x86_64/lib/libstatssocket.so"], + }, + arm: { + srcs: ["arm/lib/libstatssocket.so"], + }, + x86: { + srcs: ["x86/lib/libstatssocket.so"], + }, + }, +} + +sdk_snapshot { + name: "statsd-module-sdk@current", + visibility: ["//visibility:public"], + bootclasspath_fragments: ["statsd-module-sdk_com.android.os.statsd-bootclasspath-fragment@current"], + java_sdk_libs: ["statsd-module-sdk_framework-statsd@current"], + native_shared_libs: ["statsd-module-sdk_libstatssocket@current"], +} diff --git a/current/arm/lib/libstatssocket.so b/current/arm/lib/libstatssocket.so Binary files differindex e3c0855..e3c0855 100644..100755 --- a/current/arm/lib/libstatssocket.so +++ b/current/arm/lib/libstatssocket.so diff --git a/current/arm64/lib/libstatssocket.so b/current/arm64/lib/libstatssocket.so Binary files differindex 9fcff32..9fcff32 100644..100755 --- a/current/arm64/lib/libstatssocket.so +++ b/current/arm64/lib/libstatssocket.so diff --git a/current/x86/lib/libstatssocket.so b/current/x86/lib/libstatssocket.so Binary files differindex d43fa5b..d43fa5b 100644..100755 --- a/current/x86/lib/libstatssocket.so +++ b/current/x86/lib/libstatssocket.so diff --git a/current/x86_64/lib/libstatssocket.so b/current/x86_64/lib/libstatssocket.so Binary files differindex 2b82e4d..2b82e4d 100644..100755 --- a/current/x86_64/lib/libstatssocket.so +++ b/current/x86_64/lib/libstatssocket.so |