commit 8fbc885e12bb5ffba0dfa9420a79802cc0214448
author Tony Mak <tonymak@google.com> Mon Nov 02 14:39:03 2020 +0000
committer Tony Mak <tonymak@google.com> Mon Nov 02 15:20:44 2020 +0000
tree 95ca326b616b36900fbe9e3def9d22fc2731d98d
parent 8d20fb2242144d051d2f184d1de692c0119ad528

Set min_sdk_version to be 30

Also, added the new dependencies.

Bug: 170298047

Test: m com.android.extservices
Change-Id: Ifd74d99bcd457f838d09e087dcff37fb69e0793a

abseil-cpp/Android.bp

diff --git a/abseil-cpp/Android.bp b/abseil-cpp/Android.bp
index 8e3c3a4..4eaae5a 100644
--- a/abseil-cpp/Android.bp
+++ b/abseil-cpp/Android.bp
@@ -10,6 +10,7 @@
         "com.android.extservices",
     ],
     sdk_version: "current",
+    min_sdk_version: "30",
     stl: "libc++_static",
     exclude_srcs: [
         "**/*_test.cc",

java/Android.bp

diff --git a/java/Android.bp b/java/Android.bp
index f7ff63b..893b423 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -20,7 +20,7 @@
     static_libs: ["TextClassifierServiceLib"],
     jni_libs: ["libtextclassifier"],
     sdk_version: "system_current",
-    min_sdk_version: "28",
+    min_sdk_version: "30",
     certificate: "platform",
     optimize: {
         proguard_flags_files: ["proguard.flags"],
@@ -33,7 +33,7 @@
     name: "TextClassifierServiceLib",
     static_libs: ["TextClassifierServiceLibNoManifest"],
     sdk_version: "system_current",
-    min_sdk_version: "28",
+    min_sdk_version: "30",
     manifest: "AndroidManifest.xml",
 }
 
@@ -51,12 +51,13 @@
         "error_prone_annotations",
     ],
     sdk_version: "system_current",
-    min_sdk_version: "28",
+    min_sdk_version: "30",
 }
 
 java_library {
     name: "textclassifier-statsd",
     sdk_version: "system_current",
+    min_sdk_version: "30",
     srcs: [
         ":statslog-textclassifier-java-gen",
     ],

native/Android.bp

diff --git a/native/Android.bp b/native/Android.bp
index 442eb63..600d90c 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -113,6 +113,7 @@
 
     static_libs: [
         "marisa-trie",
+        "libtextclassifier_abseil",
         "liblua",
         "libutf",
         "libtflite_static",
@@ -151,7 +152,7 @@
 cc_library {
     name: "libtextclassifier",
     defaults: ["libtextclassifier_defaults"],
-
+    min_sdk_version: "30",
     srcs: ["**/*.cc"],
     exclude_srcs: [
         "**/*_test.*",

native/FlatBufferHeaders.bp

diff --git a/native/FlatBufferHeaders.bp b/native/FlatBufferHeaders.bp
index 267d188..ba9f677 100644
--- a/native/FlatBufferHeaders.bp
+++ b/native/FlatBufferHeaders.bp
@@ -172,6 +172,7 @@
     name: "libtextclassifier_flatbuffer_headers",
     stl: "libc++_static",
     sdk_version: "current",
+    min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
         "com.android.extservices",