commit ac858b3f916987d708f1438762a8963f71cfc6bd
author Alexander Dorokhine <adorokhine@google.com> Wed Jun 02 12:45:48 2021 -0700
committer Alexander Dorokhine <adorokhine@google.com> Wed Jun 02 12:45:48 2021 -0700
tree 1a754b5ff51679f37fde34f5f5f6e8a9cb300643
parent c2d7a0a93ed348d957b41bbff62b861af32c1eb8

Build icing against the "current" SDK for mainline compatibility.

It was being built against the private sdk with hidden APIs by default.

Bug: 146218515
Test: Builds
Change-Id: Ifd43718795ad82f38a30a5855ff5b4a154b3258d

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