diff options
| author | Mathew Inwood <mathewi@google.com> | 2021-07-15 13:59:45 +0100 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2021-07-15 15:16:39 +0100 |
| commit | 7d4c6a755a34b0a9ae839c5c196a29f8cb72ac39 (patch) | |
| tree | 89fbdb8fa5f72f9e9b8a0a1868cecba0d6e478f3 | |
| parent | 77c372a130d5bb2fcabcf6eb364515796599ff7e (diff) | |
| download | StatsD-7d4c6a755a34b0a9ae839c5c196a29f8cb72ac39.tar.gz | |
Add build rule to bypass prebuilt SDK stubs.
Test: TH
Bug: 192556458
Merged-In: I773a4afb91822103a8a666b575f128d776bed5ec
Change-Id: Icc7193288b9b3f2a62a9b29d67fd0661e3443825
| -rw-r--r-- | framework/Android.bp | 25 | ||||
| -rw-r--r-- | service/Android.bp | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/framework/Android.bp b/framework/Android.bp index 3c7597c7..344492c3 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -49,6 +49,31 @@ filegroup { "//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 da8db915..f31674f4 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -29,7 +29,7 @@ java_library { sdk_version: "system_server_current", libs: [ "framework-annotations-lib", - "framework-statsd", + "framework-statsd-internal", ], static_libs: [ "modules-utils-build", |