Aligned sqlite options / Android

sqlite-android/src/main/jni/sqlite/Android.mk

@@ -5,7 +5,6 @@ include $(CLEAR_VARS)
 #   SQLITE_TEMP_STORE=3 causes all TEMP files to go into RAM. and thats the behavior we want
 #   SQLITE_ENABLE_FTS3   enables usage of FTS3 - NOT FTS1 or 2.
 #   SQLITE_DEFAULT_AUTOVACUUM=1  causes the databases to be subject to auto-vacuum
-# https://www.sqlite.org/psow.html
 sqlite_flags := \
 	-DNDEBUG=1 \
 	-DHAVE_USLEEP=1 \
@@ -23,13 +22,14 @@ sqlite_flags := \
     -DSQLITE_ENABLE_FTS4_PARENTHESIS \
     -DSQLITE_ENABLE_FTS5 \
     -DSQLITE_ENABLE_FTS5_PARENTHESIS \
-	-DSQLITE_ENABLE_JSON1 \
-	-DSQLITE_ENABLE_RTREE=1 \
-	-DSQLITE_UNTESTABLE \
+	-D_SQLITE_ENABLE_JSON1 \
+	-D_SQLITE_ENABLE_RTREE=1 \
+	-DSQLITE_OMIT_BUILTIN_TEST \
+	-D_SQLITE_OMIT_COMPILEOPTION_DIAGS \
 	-DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 \
     -DSQLITE_DEFAULT_MEMSTATUS=0 \
     -DSQLITE_MAX_EXPR_DEPTH=0 \
-    -DSQLITE_USE_ALLOCA \
+    -D_SQLITE_USE_ALLOCA \
     -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
     -O3