Snap for 8730993 from 84b3aa147eabb6fbb916aa20e1e7b5613b267304 to mainline-tzdata3-release
Change-Id: I2d7196482ada2a87c63af0386681422f8091f29a
diff --git a/OWNERS b/OWNERS
index 46bd5b1..81cfdb8 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,6 +2,6 @@
# Please update this list if you find better candidates.
tonymak@google.com
toki@google.com
-licha@google.com
-joannechung@google.com
-lpeter@google.com
\ No newline at end of file
+zilka@google.com
+mns@google.com
+jalt@google.com
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 370acd6..72e022b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -21,25 +21,6 @@
"name": "TCSModelDownloaderIntegrationTest"
}
],
- "hwasan-postsubmit": [
- {
- "name": "TextClassifierServiceTest",
- "options": [
- {
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
- },
- {
- "name": "libtextclassifier_tests"
- },
- {
- "name": "libtextclassifier_java_tests"
- },
- {
- "name": "TextClassifierNotificationTests"
- }
- ],
"mainline-presubmit": [
{
"name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
diff --git a/abseil-cpp/Android.bp b/abseil-cpp/Android.bp
index 0ab3734..a3635f3 100644
--- a/abseil-cpp/Android.bp
+++ b/abseil-cpp/Android.bp
@@ -35,7 +35,7 @@
export_include_dirs: ["."],
visibility: [
"//external/libtextclassifier:__subpackages__",
- "//external/tflite-support:__subpackages__",
+ "//external/tflite-support:__subpackages__"
],
srcs: [
"absl/**/*.cc",
@@ -43,7 +43,6 @@
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 ed514da..a0ca6a4 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -31,7 +31,6 @@
"com.android.neuralnetworks",
"test_com.android.neuralnetworks",
],
- sdk_version: "current",
}
cc_defaults {
@@ -66,7 +65,6 @@
"com.android.neuralnetworks",
"test_com.android.neuralnetworks",
"com.android.extservices",
- "com.android.adservices",
],
}
@@ -131,63 +129,8 @@
"liblua",
"libutf",
"libtflite_static",
- "tflite_support"
- ],
-}
-
-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",
}
// -----------------
@@ -302,7 +245,7 @@
"libtextclassifier",
],
header_libs: [
- "libtextclassifier_flatbuffer_testonly_headers",
+ "libtextclassifier_flatbuffer_testonly_headers",
],
}
diff --git a/native/FlatBufferHeaders.bp b/native/FlatBufferHeaders.bp
index 235bb4a..813ec6a 100644
--- a/native/FlatBufferHeaders.bp
+++ b/native/FlatBufferHeaders.bp
@@ -176,7 +176,6 @@
apex_available: [
"//apex_available:platform",
"com.android.extservices",
- "com.android.adservices",
],
generated_headers: [
"libtextclassifier_fbgen_lang_id_common_flatbuffers_model",
diff --git a/proto/Android.bp b/proto/Android.bp
index 6b67752..c1c2825 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -14,15 +14,6 @@
// limitations under the License.
//
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "external_libtextclassifier_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["external_libtextclassifier_license"],
-}
-
java_library {
name: "textclassifier-java-proto-lite",
proto: {
@@ -37,3 +28,4 @@
"com.android.extservices",
],
}
+
