Index: gradle.properties
==================================================================
--- gradle.properties
+++ gradle.properties
@@ -15,5 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+android.useDeprecatedNdk true

Index: sqlite3/build.gradle
==================================================================
--- sqlite3/build.gradle
+++ sqlite3/build.gradle
@@ -2,17 +2,22 @@
 
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
 
+    publishNonDefault true
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    configurations {
+        debug
+        release
     }
 
     buildTypes {
         release {
             minifyEnabled false
@@ -20,28 +25,27 @@
         }
         debug {
             minifyEnabled false
             debuggable true
             jniDebuggable true
-            ndk {
-                // Building with NDK_DEBUG=1 for mips crashes the compiler in ndk 14.
-                abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64', 'mips64' // 'mips'
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "NDK_DEBUG:=1"
+                    abiFilters "armeabi-v7a", "armeabi", "x86"
+                }
             }
-
         }
     }
 
     //sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
+
     externalNativeBuild {
         ndkBuild {
             path 'src/main/jni/Android.mk'
         }
     }
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile 'com.android.support:support-annotations:24.0.0'
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
     testCompile 'junit:junit:4.12'
 }

DELETED sqlite3/src/androidTest/java/org/sqlite/database/SeeTest1.java
Index: sqlite3/src/androidTest/java/org/sqlite/database/SeeTest1.java
==================================================================
--- sqlite3/src/androidTest/java/org/sqlite/database/SeeTest1.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.sqlite.database;
-
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.AsyncTask;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.sqlite.database.sqlite.SQLiteDatabase;
-import org.sqlite.database.sqlite.SQLiteOpenHelper;
-
-import java.io.File;
-
-import static org.junit.Assert.*;
-
-
-class MyHelper extends SQLiteOpenHelper {
-
-    public static final String DATABASE_NAME = "mydb.db";
-
-    public MyHelper(Context ctx){
-        super(ctx, ctx.getDatabasePath(DATABASE_NAME).getAbsolutePath(), null, 1);
-    }
-    public void onConfigure(SQLiteDatabase db){
-        db.execSQL("PRAGMA key = 'secret'");
-
-        db.enableWriteAheadLogging();
-
-        final Cursor pragmaCursor = db.rawQuery("PRAGMA journal_mode = WAL", null);
-        pragmaCursor.moveToFirst();
-        pragmaCursor.close();
-    }
-    public void onCreate(SQLiteDatabase db){
-        db.execSQL("CREATE TABLE t1(x)");
-    }
-    public void onUpgrade(SQLiteDatabase db, int iOld, int iNew){
-    }
-}
-
-
-/**
- * Created by dan on 5/3/17.
- */
-@RunWith(AndroidJUnit4.class)
-public class SeeTest1 {
-        private Context mContext;
-
-    @Before
-    public void setup() throws Exception {
-
-        System.loadLibrary("sqliteX");
-
-        mContext = InstrumentationRegistry.getTargetContext();
-
-        // delete any existing database
-        File databaseFile = mContext.getDatabasePath(MyHelper.DATABASE_NAME);
-        databaseFile.mkdirs();
-        if (databaseFile.exists()) {
-            databaseFile.delete();
-        }
-    }
-
-    @Test
-    public void testAndroidDefaultWalMode() throws Exception {
-        // create database
-        final MyHelper helper = new MyHelper(mContext);
-        helper.getWritableDatabase();
-
-        // verify that WAL journal mode is set
-        final Cursor pragmaCursor = helper.getWritableDatabase().rawQuery("PRAGMA journal_mode", null);
-        pragmaCursor.moveToFirst();
-        Assert.assertEquals(pragmaCursor.getString(pragmaCursor.getColumnIndex("journal_mode")), "wal");
-        pragmaCursor.close();
-
-        // start long running transaction
-        AsyncTask.execute(new Runnable() {
-            @Override
-            public void run() {
-                helper.getWritableDatabase().beginTransactionNonExclusive();
-
-                // simulate long insert
-                try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-
-                helper.getWritableDatabase().setTransactionSuccessful();
-                helper.getWritableDatabase().endTransaction();
-            }
-        });
-
-        // wait a short time until the long transaction starts
-        Thread.sleep(300);
-
-        long startTime = System.currentTimeMillis();
-
-        //try to read something from the database while the slow transaction is running
-        helper.getWritableDatabase().execSQL("SELECT * FROM t1");
-
-        //verify that the operation didn't wait until the 3000ms long operation finished
-        if (System.currentTimeMillis() - startTime > 3000) {
-            throw new Exception("WAL mode isn't working corectly - read operation was blocked");
-        }
-    }
-}

Index: sqlite3/src/main/jni/sqlite/Android.mk
==================================================================
--- sqlite3/src/main/jni/sqlite/Android.mk
+++ sqlite3/src/main/jni/sqlite/Android.mk
@@ -3,12 +3,10 @@
 include $(CLEAR_VARS)
 
 # If using SEE, uncomment the following:
 # LOCAL_CFLAGS += -DSQLITE_HAS_CODEC
 
-#Define HAVE_USLEEP, otherwise ALL sleep() calls take at least 1000ms
-LOCAL_CFLAGS += -DHAVE_USLEEP=1
 
 # Enable SQLite extensions.
 LOCAL_CFLAGS += -DSQLITE_ENABLE_FTS5 
 LOCAL_CFLAGS += -DSQLITE_ENABLE_RTREE
 LOCAL_CFLAGS += -DSQLITE_ENABLE_JSON1