commit fc3e3056c3703211a89730b7e12db3fe36c440f9
author Muhammad Qureshi <muhammadq@google.com> Sun Feb 09 13:27:28 2020 -0800
committer Muhammad Qureshi <muhammadq@google.com> Mon Feb 10 17:35:34 2020 -0800
tree 1737478ef201bc40430584e6c5380947e24ef07e
parent 6c0f623a01ef69474f86819d5438116f375e4d14

Clean up framework-statsd

- Include framework aidl sources where needed.
- Don't use core_platform as sdk_version. Use current or system_current
or core_current temporarily until module_current is ready
- Use android_module_lib_stubs_current where applicable.
- remove visibility to wifi
- Remove framework-all dependency

Bug: 146209659
Bug: 146167933
Test: m
Test: fastboot flashall
Test: m framework-statsd-stubs-systemapi
Test: m framework-statsd-stubs-publicapi
Test: m framework-statsd-stubs-module_libs_api
Change-Id: I80c793cb9a51a2e3b07c2a679c5342c91dc493d4

apex/statsd/service/Android.bp

diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp
index 0f8a151..0f325e3 100644
--- a/apex/statsd/service/Android.bp
+++ b/apex/statsd/service/Android.bp
@@ -16,16 +16,21 @@
     srcs: [
         ":service-statsd-sources",
     ],
-    // TODO(b/146209659): Use system_current instead once framework-statsd compiles against
-    // system_current.
+
+    // TODO(b/146757305) should be "module_current" since not allowed to use
+    // @CorePlatformApi's
     sdk_version: "core_platform",
+
     libs: [
         "framework-annotations-lib",
-        "framework-statsd",
-        // TODO(b/146758669): Remove this line after nullability annotations are system APIs.
-        "android_system_stubs_current",
         "services-stubs",
+        "framework-statsd",
+
+        // TODO(b/146757305): should be unnecessary once
+        // sdk_version="module_lib_current" or "module_current"
+        "android_module_lib_stubs_current",
     ],
+
     apex_available: [
         "com.android.os.statsd",
         "test_com.android.os.statsd",