Snap for 6198741 from 3e4e6f7d41f7ca387810fc88370d9bcd8c937fb9 to sdk-release
Change-Id: I0adf9d49941bc75cbb27d6f387e6c0fdc72d9ef7
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;
diff --git a/dist/Android.bp b/dist/Android.bp
index f7e43f3..414c84d 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -40,6 +40,10 @@
"-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
"-Wno-unused-parameter",
"-Werror",
+
+ // Turn off the new pass manager due to miscompile.
+ // http://b/131854833
+ "-fno-experimental-new-pass-manager",
],
target: {