Snap for 8618784 from 005ce65d018aaa43641580e1316a09f255d9118f to mainline-media-release
Change-Id: If9859dcc50f567ab7eed1e2bb46b88ed126fb31b
diff --git a/native/Android.bp b/native/Android.bp
index b80c979..ed514da 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -135,6 +135,61 @@
],
}
+cc_library_static {
+ name: "libtextclassifier_bert_tokenizer",
+ export_include_dirs: ["."],
+ visibility: ["//external/tflite-support:__subpackages__"],
+ srcs: [
+ "utils/base/logging.cc",
+ "utils/base/logging_raw.cc",
+ "utils/bert_tokenizer.cc",
+ "utils/strings/utf8.cc",
+ "utils/tokenizer-utils.cc",
+ "utils/utf8/unilib-common.cc",
+ "utils/utf8/unicodetext.cc",
+ "utils/wordpiece_tokenizer.cc",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.extservices",
+ "com.android.adservices",
+ ],
+ cflags: [
+ "-Wno-ignored-qualifiers",
+ "-Wno-missing-field-initializers",
+ "-Wno-unused-parameter",
+
+ "-DLIBTEXTCLASSIFIER_UNILIB_ICU",
+ "-DZLIB_CONST",
+ "-DSAFTM_COMPACT_LOGGING",
+ "-DTC3_WITH_ACTIONS_OPS",
+ "-DTC3_UNILIB_JAVAICU",
+ "-DTC3_CALENDAR_JAVAICU",
+ "-DTC3_AOSP",
+ "-DTC3_VOCAB_ANNOTATOR_IMPL",
+ "-DTC3_POD_NER_ANNOTATOR_IMPL",
+ ],
+ product_variables: {
+ debuggable: {
+ // Only enable debug logging in userdebug/eng builds.
+ cflags: ["-DTC3_DEBUG_LOGGING=1"],
+ },
+ },
+ header_libs: [
+ "jni_headers",
+ "tensorflow_headers",
+ "flatbuffer_headers",
+ "libtextclassifier_flatbuffer_headers",
+ ],
+ static_libs: [
+ "libtextclassifier_abseil",
+ "tflite_support",
+ ],
+ sdk_version: "current",
+ min_sdk_version: "30",
+ stl: "libc++_static",
+}
+
// -----------------
// Generate headers with FlatBuffer schema compiler.
// -----------------
diff --git a/native/FlatBufferHeaders.bp b/native/FlatBufferHeaders.bp
index 813ec6a..235bb4a 100644
--- a/native/FlatBufferHeaders.bp
+++ b/native/FlatBufferHeaders.bp
@@ -176,6 +176,7 @@
apex_available: [
"//apex_available:platform",
"com.android.extservices",
+ "com.android.adservices",
],
generated_headers: [
"libtextclassifier_fbgen_lang_id_common_flatbuffers_model",