Merge "Add statsd_java_aidl to framework-statsd"

2020-02-08 19:51:04 +00:00
parent c2d0b5d516 555400f13b
commit d3e560f53f
2 changed files with 2 additions and 4 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -263,8 +263,6 @@ filegroup {
        ":libcamera_client_aidl",
        ":libcamera_client_framework_aidl",
        ":libupdate_engine_aidl",
-        // TODO: this needs to be removed when statsd-framework.jar is separated out
-        ":statsd_java_aidl",
        ":storaged_aidl",
        ":vold_aidl",

--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -15,9 +15,9 @@
 filegroup {
    name: "framework-statsd-sources",
    srcs: [
-    "java/**/*.java",
+        "java/**/*.java",
+        ":statsd_java_aidl",
    ],
-    path: "java",
 }

 java_library {