Merge "Version bump for development statsd apex" into sc-dev
diff --git a/framework/Android.bp b/framework/Android.bp
index 3c7597c..344492c 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -49,6 +49,31 @@
"//packages/modules/StatsD/framework:__subpackages__",
],
}
+
+// This target is used by service-statsd to bypass the prebuilt SDK artifacts
+// for framework-statsd when SDK prebuilts are enabled.
+//
+// When SDK prebuilts are disabled, the target framework-statsd exposes all
+// Java classes/methods, not only those that are a part of a stable API surface.
+// When SDK prebuilts are enabled however, only the stable API surface is
+// exposed from that target.
+java_library {
+ name: "framework-statsd-internal",
+ defaults: ["framework-module-defaults"],
+ sdk_version: "module_current",
+ srcs: [
+ ":framework-statsd-sources",
+ ],
+ apex_available: [
+ "com.android.os.statsd",
+ "test_com.android.os.statsd",
+ ],
+ min_sdk_version: "30",
+ visibility: [
+ "//packages/modules/StatsD:__subpackages__",
+ ],
+}
+
java_sdk_library {
name: "framework-statsd",
defaults: ["framework-module-defaults"],
diff --git a/service/Android.bp b/service/Android.bp
index da8db91..f31674f 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -29,7 +29,7 @@
sdk_version: "system_server_current",
libs: [
"framework-annotations-lib",
- "framework-statsd",
+ "framework-statsd-internal",
],
static_libs: [
"modules-utils-build",
