From 6f17fb0a524e57bac9bb32dcd2874b33c4537f28 Mon Sep 17 00:00:00 2001
From: Vinh Tran <vinhdaitran@google.com>
Date: Mon, 1 May 2023 17:47:12 -0400
Subject: Replace filegroup with aidl_library module type

Test: CI
Change-Id: I137be9f376f3661973c10a02649411ce3a4bcea8
---
 core/java/Android.bp     | 13 +++++++++----
 libs/services/Android.bp |  7 ++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index 7df3d1e13aa0..258d71314752 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -31,9 +31,14 @@ filegroup {
     srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
 }
 
-filegroup {
-    name: "IDropBoxManagerService.aidl",
-    srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],
+aidl_library {
+    name: "IDropBoxManagerService_aidl",
+    srcs: [
+        "com/android/internal/os/IDropBoxManagerService.aidl",
+    ],
+    hdrs: [
+        "android/os/DropBoxManager.aidl",
+    ],
 }
 
 filegroup {
@@ -146,7 +151,7 @@ filegroup {
     ],
 }
 
-filegroup {
+aidl_library {
     name: "ILogcatManagerService_aidl",
     srcs: ["android/os/logcat/ILogcatManagerService.aidl"],
 }
diff --git a/libs/services/Android.bp b/libs/services/Android.bp
index f656ebfc3b77..0b7e7d37718d 100644
--- a/libs/services/Android.bp
+++ b/libs/services/Android.bp
@@ -26,8 +26,6 @@ package {
 cc_library_shared {
     name: "libservices",
     srcs: [
-        ":IDropBoxManagerService.aidl",
-        ":ILogcatManagerService_aidl",
         "src/content/ComponentName.cpp",
         "src/os/DropBoxManager.cpp",
     ],
@@ -42,7 +40,10 @@ cc_library_shared {
         "libbase_headers",
     ],
     aidl: {
-        include_dirs: ["frameworks/base/core/java/"],
+        libs: [
+            "ILogcatManagerService_aidl",
+            "IDropBoxManagerService_aidl",
+        ],
     },
 
     export_include_dirs: ["include"],
-- 
cgit v1.2.3-59-g8ed1b