commit c950522d4f590a9a7477373083697720fe7e7eef
author Alexander Dorokhine <adorokhine@google.com> Mon Jun 21 20:20:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 21 20:20:05 2021 +0000
tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 02a6fd9812ee1f8dfa39534f34c05e630c7029f0
parent a923473f1d2e74c23bfb6acc35e194b10dba2277

Merge remote-tracking branch 'goog/androidx-platform-dev' into sc-dev am: c2d7a0a93e am: ba0008abe8 am: 762e61be43 am: a923473f1d

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

Change-Id: I5de5badbba046aa85799519f8b973f1ae67c8f94

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"],
 }