From 555400f13bd0d97e520589655accbc299999ef5a Mon Sep 17 00:00:00 2001
From: Muhammad Qureshi <muhammadq@google.com>
Date: Fri, 7 Feb 2020 09:10:55 -0800
Subject: [PATCH] Add statsd_java_aidl to framework-statsd

Bug: 146578171
Test: m
Change-Id: I9ed1e4ea357e6825dc587f9311ac80c838e5a0b7
---
 Android.bp                       | 2 --
 apex/statsd/framework/Android.bp | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Android.bp b/Android.bp
index f63e78bedd43f..2dc8a4c2f39e4 100644
--- 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",
 
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index d85ae69b799fe..e3c70d7982ac1 100644
--- 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 {