From fd6c615054b30c6e8ad830b7b82b0550033a8fef Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 10 May 2021 12:13:19 +0100
Subject: [PATCH] Fix appsearch filegroups to match package

The "java" directory in appsearch contains both a package structure and
subdirectories that include a package structure. Update the build
structure to match that.

This is part of a chunk of work necessary to avoidi unintentional
classes being included in the public documentation.

Bug: 187386774
Test: diff docs with/without package filter applied
Change-Id: I312d5cef014557b02d5c015899944ffdea8ca168
---
 apex/appsearch/framework/Android.bp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/apex/appsearch/framework/Android.bp b/apex/appsearch/framework/Android.bp
index 5bf0b84b570d1..f92f44bc853f4 100644
--- a/apex/appsearch/framework/Android.bp
+++ b/apex/appsearch/framework/Android.bp
@@ -23,12 +23,30 @@ package {
 
 filegroup {
     name: "framework-appsearch-sources",
+    srcs: [
+        ":framework-appsearch-internal-sources",
+        ":framework-appsearch-external-sources",
+    ],
+    visibility: ["//frameworks/base"],
+}
+
+filegroup {
+    name: "framework-appsearch-internal-sources",
     srcs: [
         "java/**/*.java",
         "java/**/*.aidl",
     ],
+    exclude_srcs: [":framework-appsearch-external-sources"],
     path: "java",
-    visibility: ["//frameworks/base"],
+}
+
+filegroup {
+    name: "framework-appsearch-external-sources",
+    srcs: [
+        "java/external/**/*.java",
+        "java/external/**/*.aidl",
+    ],
+    path: "java/external",
 }
 
 java_sdk_library {