Revert "Use -Werror in external/libtextclassifier" am: 978467b255 am: 7102557719
am: 8447aa2863
Change-Id: I9553a48bbed167d5cf313fe729bae19f423781e6
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..a886a0c
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,17 @@
+cc_library_headers {
+ name: "libtextclassifier_hash_headers",
+ vendor_available: true,
+ export_include_dirs: ["."],
+}
+
+cc_library_shared {
+ name: "libtextclassifier_hash",
+ vendor_available: true,
+ srcs: [
+ "util/hash/farmhash.cc",
+ "util/hash/hash.cc"
+ ],
+ cflags: [
+ "-DNAMESPACE_FOR_HASH_FUNCTIONS=farmhash"
+ ],
+}
diff --git a/Android.mk b/Android.mk
index d579d0e..0959572 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,8 +71,6 @@
LOCAL_SHARED_LIBRARIES += libprotobuf-cpp-lite
LOCAL_SHARED_LIBRARIES += liblog
LOCAL_SHARED_LIBRARIES += libicuuc libicui18n
-LOCAL_REQUIRED_MODULES := textclassifier.langid.model
-LOCAL_REQUIRED_MODULES += textclassifier.smartselection.en.model
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/jni.lds
LOCAL_LDFLAGS += -Wl,-version-script=$(LOCAL_PATH)/jni.lds
@@ -205,10 +203,10 @@
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
-LOCAL_MODULE := textclassifier.smartselection.pt-PT.model
+LOCAL_MODULE := textclassifier.smartselection.pt.model
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_OWNER := google
-LOCAL_SRC_FILES := ./models/textclassifier.smartselection.pt-PT.model
+LOCAL_SRC_FILES := ./models/textclassifier.smartselection.pt.model
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/textclassifier
include $(BUILD_PREBUILT)
diff --git a/models/textclassifier.smartselection.ar.model b/models/textclassifier.smartselection.ar.model
index 57f6002..f22fe0f 100644
--- a/models/textclassifier.smartselection.ar.model
+++ b/models/textclassifier.smartselection.ar.model
Binary files differ
diff --git a/models/textclassifier.smartselection.de.model b/models/textclassifier.smartselection.de.model
index 59c0bce..5eb3181 100644
--- a/models/textclassifier.smartselection.de.model
+++ b/models/textclassifier.smartselection.de.model
Binary files differ
diff --git a/models/textclassifier.smartselection.en.model b/models/textclassifier.smartselection.en.model
index 645303d..315e2b4 100644
--- a/models/textclassifier.smartselection.en.model
+++ b/models/textclassifier.smartselection.en.model
Binary files differ
diff --git a/models/textclassifier.smartselection.es.model b/models/textclassifier.smartselection.es.model
index cbb902b..9ea6af9 100644
--- a/models/textclassifier.smartselection.es.model
+++ b/models/textclassifier.smartselection.es.model
Binary files differ
diff --git a/models/textclassifier.smartselection.fr.model b/models/textclassifier.smartselection.fr.model
index 5c95a7c..3ff5416 100644
--- a/models/textclassifier.smartselection.fr.model
+++ b/models/textclassifier.smartselection.fr.model
Binary files differ
diff --git a/models/textclassifier.smartselection.it.model b/models/textclassifier.smartselection.it.model
index 138c351..377fff5 100644
--- a/models/textclassifier.smartselection.it.model
+++ b/models/textclassifier.smartselection.it.model
Binary files differ
diff --git a/models/textclassifier.smartselection.ja.model b/models/textclassifier.smartselection.ja.model
index ab5f4ba..53fce93 100644
--- a/models/textclassifier.smartselection.ja.model
+++ b/models/textclassifier.smartselection.ja.model
Binary files differ
diff --git a/models/textclassifier.smartselection.ko.model b/models/textclassifier.smartselection.ko.model
index b696114..6bcac15 100644
--- a/models/textclassifier.smartselection.ko.model
+++ b/models/textclassifier.smartselection.ko.model
Binary files differ
diff --git a/models/textclassifier.smartselection.nl.model b/models/textclassifier.smartselection.nl.model
index 2385f96..c80dff6 100644
--- a/models/textclassifier.smartselection.nl.model
+++ b/models/textclassifier.smartselection.nl.model
Binary files differ
diff --git a/models/textclassifier.smartselection.pl.model b/models/textclassifier.smartselection.pl.model
index 94d873f..3379c63 100644
--- a/models/textclassifier.smartselection.pl.model
+++ b/models/textclassifier.smartselection.pl.model
Binary files differ
diff --git a/models/textclassifier.smartselection.pt-PT.model b/models/textclassifier.smartselection.pt-PT.model
deleted file mode 100644
index 63f4eb9..0000000
--- a/models/textclassifier.smartselection.pt-PT.model
+++ /dev/null
Binary files differ
diff --git a/models/textclassifier.smartselection.pt.model b/models/textclassifier.smartselection.pt.model
new file mode 100644
index 0000000..4378c8f
--- /dev/null
+++ b/models/textclassifier.smartselection.pt.model
Binary files differ
diff --git a/models/textclassifier.smartselection.ru.model b/models/textclassifier.smartselection.ru.model
index f1a2d02..0763b33 100644
--- a/models/textclassifier.smartselection.ru.model
+++ b/models/textclassifier.smartselection.ru.model
Binary files differ
diff --git a/models/textclassifier.smartselection.th.model b/models/textclassifier.smartselection.th.model
index 7c327e9..521fea0 100644
--- a/models/textclassifier.smartselection.th.model
+++ b/models/textclassifier.smartselection.th.model
Binary files differ
diff --git a/models/textclassifier.smartselection.tr.model b/models/textclassifier.smartselection.tr.model
index ab679c2..0177175 100644
--- a/models/textclassifier.smartselection.tr.model
+++ b/models/textclassifier.smartselection.tr.model
Binary files differ
diff --git a/models/textclassifier.smartselection.zh-Hant.model b/models/textclassifier.smartselection.zh-Hant.model
index 92390d7..ec03c26 100644
--- a/models/textclassifier.smartselection.zh-Hant.model
+++ b/models/textclassifier.smartselection.zh-Hant.model
Binary files differ
diff --git a/models/textclassifier.smartselection.zh.model b/models/textclassifier.smartselection.zh.model
index 1de5947..acc6142 100644
--- a/models/textclassifier.smartselection.zh.model
+++ b/models/textclassifier.smartselection.zh.model
Binary files differ
