commit c787f2b8f18a89704a8fd546090b54b5caa7c235
author Yi Kong <yikong@google.com> Thu May 07 16:03:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 07 16:03:16 2020 +0000
tree d32849839a4a69ac78949d0920fddfa325736ea3
parent dd2d1f433e86f74252e16affc2c61ef730adc76d
parent 0d07957c0dba557c1152049c3cbf3cb76d3c14ca

Merge "Revert^3 "Turn off the new pass manager due to miscompile""

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}

android/sqlite3_android.cpp

diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp
index d2f1802..d204bd0 100644
--- a/android/sqlite3_android.cpp
+++ b/android/sqlite3_android.cpp
@@ -237,6 +237,7 @@
     UCollator* collator;
 };
 
+#if 0
 /**
  * This function is invoked as:
  *
@@ -413,6 +414,7 @@
     } while ((token = u_strtok_r(NULL, delim, &state)) != NULL);
     sqlite3_result_int(context, numTokens);
 }
+#endif
 
 static void localized_collator_dtor(UCollator* collator)
 {
@@ -457,6 +459,7 @@
         return err;
     }
 
+#if 0
     // Register the _TOKENIZE function
     err = sqlite3_create_function(handle, "_TOKENIZE", 4, SQLITE_UTF16, collator, tokenize, NULL, NULL);
     if (err != SQLITE_OK) {
@@ -470,6 +473,7 @@
     if (err != SQLITE_OK) {
         return err;
     }
+#endif
 
     //// PHONEBOOK_COLLATOR
     status = U_ZERO_ERROR;