commit 70f26ac5ad273a9acfcccccd7f0401d26ad7bb5f
author Alexander Dorokhine <adorokhine@google.com> Sat Jun 12 23:25:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 12 23:25:03 2021 +0000
tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent 762e61be438c8f6257582b67ad23e979e59f6b02
parent cc27da1e764657bd8c177edc56304f6f6739e835

Build icing against the "current" SDK for mainline compatibility. am: ac858b3f91 am: cc27da1e76

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

Change-Id: I298c808e56fc8b0854e6d7a5a6ff35c1ed913183

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