Merge SP1A.211205.008
Bug: 205056467
Merged-In: I9a138cdc4cf2767f35b6ccd7a57b892f6fb2dbb5
Change-Id: I1fd0d85e18162162cb5305d6a9abeff06a1bb3ae
diff --git a/current/Android.bp b/current/Android.bp
index d193998..ea0b027 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -34,7 +34,7 @@
module_prebuilt_bootclasspath_fragment {
name: "com.android.os.statsd-bootclasspath-fragment",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -75,6 +75,7 @@
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: {
@@ -82,6 +83,7 @@
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: {
@@ -89,13 +91,14 @@
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",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -119,6 +122,7 @@
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: {
@@ -126,6 +130,7 @@
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: {
@@ -133,6 +138,7 @@
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",
},
}
@@ -190,7 +196,7 @@
module_cc_prebuilt_library_shared {
name: "libstatssocket",
- prefer: true,
+ prefer: false,
soong_config_variables: {
module_build_from_source: {
prefer: false,
diff --git a/current/sdk_library/module-lib/framework-statsd_annotations.zip b/current/sdk_library/module-lib/framework-statsd_annotations.zip
new file mode 100644
index 0000000..bfbd02c
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-statsd_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-statsd_annotations.zip b/current/sdk_library/public/framework-statsd_annotations.zip
new file mode 100644
index 0000000..7f3e91d
--- /dev/null
+++ b/current/sdk_library/public/framework-statsd_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-statsd_annotations.zip b/current/sdk_library/system/framework-statsd_annotations.zip
new file mode 100644
index 0000000..bfbd02c
--- /dev/null
+++ b/current/sdk_library/system/framework-statsd_annotations.zip
Binary files differ
