commit ea2e736293364048f652dd1c889a9ccb15aae106
author Xin Li <delphij@google.com> Thu Sep 10 17:21:55 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 10 17:21:55 2020 +0000
tree 05b507f96168f76e8c985ad05a083b35d92bd688
parent 6077a3781f14a746fb56336e19957e1e457e9ae0
parent cdbc4304d70d0932207d8ac2b79e5e303594ed0f

Merge "Merge Android R"

android/Android.bp

diff --git a/android/Android.bp b/android/Android.bp
index 0cccef1..11b2ce6 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -19,7 +19,10 @@
     ],
     target: {
         android: {
-            cflags: ["-DSQLITE_ENABLE_ICU"],
+            cflags: [
+                    "-DSQLITE_ENABLE_ICU",
+                    "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE",
+            ],
             shared_libs: [
                 "libandroidicu",
             ],

dist/Android.bp

diff --git a/dist/Android.bp b/dist/Android.bp
index 8f4e60a..ed8a9ff 100644
--- a/dist/Android.bp
+++ b/dist/Android.bp
@@ -38,6 +38,7 @@
         "-DSQLITE_SECURE_DELETE",
         "-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE",
         "-DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD",
+        "-DSQLITE_DEFAULT_LEGACY_ALTER_TABLE",
         "-Wno-unused-parameter",
         "-Werror",