diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-16 21:55:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-16 21:55:28 +0000 |
| commit | 416f776c617b85b6c09211c738f03049af8af432 (patch) | |
| tree | 98ab2cab2a7eedee6d202723e691c69c641924f7 | |
| parent | 7b240d8d58cdb059b298fc0553e1ebeaabc437d9 (diff) | |
| parent | 005ce65d018aaa43641580e1316a09f255d9118f (diff) | |
| download | libtextclassifier-android13-mainline-go-wifi-release.tar.gz | |
Snap for 8736029 from 005ce65d018aaa43641580e1316a09f255d9118f to mainline-go-wifi-releaseaml_go_wif_330911000android13-mainline-go-wifi-release
Change-Id: I120d29237fd61e879b0274b4854257c758b1ba81
| -rw-r--r-- | abseil-cpp/Android.bp | 3 | ||||
| -rw-r--r-- | native/Android.bp | 56 | ||||
| -rw-r--r-- | native/FlatBufferHeaders.bp | 1 |
3 files changed, 59 insertions, 1 deletions
diff --git a/abseil-cpp/Android.bp b/abseil-cpp/Android.bp index a3635f3..0ab3734 100644 --- a/abseil-cpp/Android.bp +++ b/abseil-cpp/Android.bp @@ -35,7 +35,7 @@ cc_library_static { export_include_dirs: ["."], visibility: [ "//external/libtextclassifier:__subpackages__", - "//external/tflite-support:__subpackages__" + "//external/tflite-support:__subpackages__", ], srcs: [ "absl/**/*.cc", @@ -43,6 +43,7 @@ cc_library_static { apex_available: [ "//apex_available:platform", "com.android.extservices", + "com.android.adservices", ], sdk_version: "current", min_sdk_version: "30", diff --git a/native/Android.bp b/native/Android.bp index 53d6d2d..ed514da 100644 --- a/native/Android.bp +++ b/native/Android.bp @@ -66,6 +66,7 @@ cc_library_static { "com.android.neuralnetworks", "test_com.android.neuralnetworks", "com.android.extservices", + "com.android.adservices", ], } @@ -134,6 +135,61 @@ cc_defaults { ], } +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 @@ cc_library_headers { apex_available: [ "//apex_available:platform", "com.android.extservices", + "com.android.adservices", ], generated_headers: [ "libtextclassifier_fbgen_lang_id_common_flatbuffers_model", |