Snap for 10102166 from c25283ad476bbfa14eb4f335fe40d3c75339b079 to mainline-tzdata4-release
Change-Id: I932703f6c70d79a0d7564c5148fdfd618d3d7b0d
diff --git a/1/Android.bp b/1/Android.bp.auto
similarity index 100%
rename from 1/Android.bp
rename to 1/Android.bp.auto
diff --git a/current/Android.bp b/current/Android.bp
index 1f21cbb..c0c41f7 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -18,30 +18,6 @@
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"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
- hidden_api: {
- max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
module_prebuilt_bootclasspath_fragment {
name: "com.android.os.statsd-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -72,48 +48,6 @@
},
}
-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",
- annotations: "sdk_library/public/framework-statsd_annotations.zip",
- 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",
- annotations: "sdk_library/system/framework-statsd_annotations.zip",
- 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",
- annotations: "sdk_library/module-lib/framework-statsd_annotations.zip",
- sdk_version: "module_current",
- },
-}
-
module_java_sdk_library_import {
name: "framework-statsd",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -162,18 +96,6 @@
},
}
-java_import {
- name: "statsd-module-sdk_service-statsd@current",
- sdk_member_name: "service-statsd",
- visibility: ["//visibility:public"],
- apex_available: [
- "com.android.os.statsd",
- "test_com.android.os.statsd",
- ],
- licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
- jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar"],
-}
-
module_java_import {
name: "service-statsd",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -193,55 +115,12 @@
}
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.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"],
- },
- },
-}
-
module_cc_prebuilt_library_shared {
name: "libstatssocket",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -282,15 +161,6 @@
},
}
-prebuilt_systemserverclasspath_fragment {
- name: "statsd-module-sdk_com.android.os.statsd-systemserverclasspath-fragment@current",
- sdk_member_name: "com.android.os.statsd-systemserverclasspath-fragment",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.os.statsd"],
- licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
- standalone_contents: ["statsd-module-sdk_service-statsd@current"],
-}
-
module_prebuilt_systemserverclasspath_fragment {
name: "com.android.os.statsd-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
@@ -305,13 +175,3 @@
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
standalone_contents: ["service-statsd"],
}
-
-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"],
- java_systemserver_libs: ["statsd-module-sdk_service-statsd@current"],
- native_shared_libs: ["statsd-module-sdk_libstatssocket@current"],
- systemserverclasspath_fragments: ["statsd-module-sdk_com.android.os.statsd-systemserverclasspath-fragment@current"],
-}