commit 76c8f9b47d2fa9064675e92542af44c1e50b0de1
author Chaohui Wang <chaohuiw@google.com> Sun May 28 11:26:33 2023 +0800
committer Chaohui Wang <chaohuiw@google.com> Wed May 31 08:04:17 2023 +0000
tree 876d83f54db84b853e42c3fd3bab6c5bc325b9c0
parent 77ccd8bc011ed9ec2582a1ac1d828e26aba8bc7e

Let IndexableProcessor support different packages

Add a new annotation option key:
com.android.settingslib.search.processor.package

So the generated SearchIndexableResources* could be in given package.

Also clean up common.mk since it's no longer used.

Bug: 284799832
Test: m Settings
Test: Manually try Settings Search
Change-Id: I5848e6fcedf4e40804c347a2f7717dc6d5f615de

packages/SettingsLib/search/Android.bp

diff --git a/packages/SettingsLib/search/Android.bp b/packages/SettingsLib/search/Android.bp
index cfff519..918d696 100644
--- a/packages/SettingsLib/search/Android.bp
+++ b/packages/SettingsLib/search/Android.bp
@@ -7,8 +7,18 @@
     default_applicable_licenses: ["frameworks_base_license"],
 }
 
+java_library {
+    name: "SettingsLib-search-interface",
+    visibility: ["//visibility:private"],
+    srcs: ["interface-src/**/*.java"],
+    host_supported: true,
+}
+
 android_library {
     name: "SettingsLib-search",
+    static_libs: [
+        "SettingsLib-search-interface",
+    ],
     srcs: ["src/**/*.java"],
 
     sdk_version: "system_current",
@@ -19,12 +29,10 @@
     name: "SettingsLib-annotation-processor",
     processor_class: "com.android.settingslib.search.IndexableProcessor",
     static_libs: [
+        "SettingsLib-search-interface",
         "javapoet",
     ],
-    srcs: [
-        "processor-src/**/*.java",
-        "src/com/android/settingslib/search/SearchIndexable.java",
-    ],
+    srcs: ["processor-src/**/*.java"],
     java_resource_dirs: ["resources"],
 }