Remove expensive logging statement. am: 84b3aa147e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/17571123
Change-Id: I34a62ff6d8220854ea4a56bec671a215cdaab960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/OWNERS b/OWNERS
index 81cfdb8..46bd5b1 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,6 +2,6 @@
# Please update this list if you find better candidates.
tonymak@google.com
toki@google.com
-zilka@google.com
-mns@google.com
-jalt@google.com
+licha@google.com
+joannechung@google.com
+lpeter@google.com
\ No newline at end of file
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 72e022b..370acd6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -21,6 +21,25 @@
"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/native/Android.bp b/native/Android.bp
index a0ca6a4..53d6d2d 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -31,6 +31,7 @@
"com.android.neuralnetworks",
"test_com.android.neuralnetworks",
],
+ sdk_version: "current",
}
cc_defaults {
@@ -129,7 +130,7 @@
"liblua",
"libutf",
"libtflite_static",
- "tflite_support",
+ "tflite_support"
],
}
@@ -245,7 +246,7 @@
"libtextclassifier",
],
header_libs: [
- "libtextclassifier_flatbuffer_testonly_headers",
+ "libtextclassifier_flatbuffer_testonly_headers",
],
}
diff --git a/proto/Android.bp b/proto/Android.bp
index c1c2825..6b67752 100644
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -14,6 +14,15 @@
// 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: {
@@ -28,4 +37,3 @@
"com.android.extservices",
],
}
-
