commit f7be65b8948576d6cce1441c2b6f7f5f7b085895
author Xin Li <delphij@google.com> Mon Jun 21 20:17:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 21 20:17:47 2021 +0000
tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent f27d32691f43583411778756bccbaa5c54db0c5d
parent 529551e1304c1febbc59f1d6f2262892638de211

Merge sc-mainline-prod am: 529551e130

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/14802250

Change-Id: Icfb971b1120aa98b41ddda05d131f66e501af1ac

java/Android.bp

diff --git a/java/Android.bp b/java/Android.bp
index 7daeb0a..ef417ba 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -25,9 +25,12 @@
     name: "libicing-java",
     srcs: ["src/**/*.java"],
     static_libs: [
-        "androidx.annotation_annotation",
         "icing-java-proto-lite",
         "libprotobuf-java-lite",
     ],
+    libs: [
+        "androidx.annotation_annotation",
+    ],
+    sdk_version: "current",
     apex_available: ["com.android.appsearch"],
 }