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 {