Merge "Revert "Use framework-appsearch-stubs instead of framework-appsearch""

3 files changed, 26 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index a61b5472e6fc..4e2b156afbbf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -487,7 +487,7 @@ java_library {
         "framework-minus-apex",
         "updatable_media_stubs",
         "framework_mediaprovider_stubs",
-        "framework-appsearch-stubs",
+        "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
         "framework-sdkextensions-stubs-systemapi",
         // TODO(b/146167933): Use framework-statsd-stubs instead.
         "framework-statsd",
diff --git a/apex/appsearch/framework/Android.bp b/apex/appsearch/framework/Android.bp
index 60cc3bec0a9d..1f30dda21ef7 100644
--- a/apex/appsearch/framework/Android.bp
+++ b/apex/appsearch/framework/Android.bp
@@ -30,10 +30,29 @@ java_library {
   libs: [
     "framework-minus-apex",  // TODO(b/146218515) should be framework-system-stubs
   ],
-  visibility: ["//frameworks/base/apex/appsearch:__subpackages__"],
+  visibility: [
+      "//frameworks/base/apex/appsearch:__subpackages__",
+      // TODO(b/146218515) remove this when framework is built with the stub of appsearch
+      "//frameworks/base",
+  ],
   apex_available: ["com.android.appsearch"],
 }
 
+metalava_appsearch_docs_args =
+    "--hide-package com.android.server " +
+    "--error UnhiddenSystemApi " +
+    "--hide RequiresPermission " +
+    "--hide MissingPermission " +
+    "--hide BroadcastBehavior " +
+    "--hide HiddenSuperclass " +
+    "--hide DeprecationMismatch " +
+    "--hide UnavailableSymbol " +
+    "--hide SdkConstant " +
+    "--hide HiddenTypeParameter " +
+    "--hide Todo --hide Typo " +
+    "--hide HiddenTypedefConstant " +
+    "--show-annotation android.annotation.SystemApi "
+
 droidstubs {
     name: "framework-appsearch-stubs-srcs",
     srcs: [
@@ -43,8 +62,9 @@ droidstubs {
     aidl: {
         include_dirs: ["frameworks/base/core/java"],
     },
-    defaults: ["framework-module-stubs-defaults-systemapi"],
-    sdk_version: "system_current",
+    args: metalava_appsearch_docs_args,
+    sdk_version: "core_current",
+    libs: ["android_system_stubs_current"],
 }
 
 java_library {
@@ -55,6 +75,7 @@ java_library {
             "java",
         ],
     },
-    sdk_version: "system_current",
+    sdk_version: "core_current",
+    libs: ["android_system_stubs_current"],
     installable: false,
 }
diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp
index e7abcd9a645a..8aed5d04a32b 100644
--- a/apex/appsearch/service/Android.bp
+++ b/apex/appsearch/service/Android.bp
@@ -20,7 +20,6 @@ java_library {
   libs: [
     "framework",
     "services.core",
-    "framework-appsearch",
   ],
   static_libs: [
     "icing-java-proto-lite",