add armeabi-v7a support

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
  repositories {
  jcenter()
+ google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:2.3.0'
+ classpath 'com.android.tools.build:gradle:3.1.4'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
  repositories {
  jcenter()
+ google()
  }
 }
 

sqlite3/build.gradle

@@ -2,42 +2,41 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
 android {
- compileSdkVersion 23
- buildToolsVersion '25.0.2'
+ compileSdkVersion 23
 
- defaultConfig {
- minSdkVersion 16
- targetSdkVersion 23
- versionCode 3
- versionName "1.0.2"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
+ defaultConfig {
+ minSdkVersion 16
+ targetSdkVersion 23
+ versionCode 4
+ versionName "1.0.3"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
 
- sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
+ sourceSets.main.jni.srcDirs = [] //disable automatic ndk-build call
 
- sourceSets.main {
- jniLibs.srcDir 'src/main/libs'
- }
+ sourceSets.main {
+ jniLibs.srcDir 'src/main/libs'
+ }
 }
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 uploadArchives {
- repositories {
- mavenDeployer {
- pom.groupId = 'com.welearn'
- pom.artifactId = 'sqlite3'
- pom.version = android.defaultConfig.versionName
- repository(url: 'http:https://nexus.dev.xdf100.com/repository/maven-releases/') {
- authentication(userName: "admin", password: "Youlearn100")
- }
- }
- }
-}
+ repositories {
+ mavenDeployer {
+ pom.groupId = 'com.welearn'
+ pom.artifactId = 'sqlite3'
+ pom.version = android.defaultConfig.versionName
+ repository(url: 'http:https://nexus.dev.xdf100.com/repository/maven-releases/') {
+ authentication(userName: "admin", password: "Youlearn100")
+ }
+ }
+ }
+}

sqlite3/sqlite3.iml

@@ -23,25 +23,26 @@
  </configuration>
  </facet>
  </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
  <output url="file:https://$MODULE_DIR$/build/intermediates/classes/debug" />
  <output-test url="file:https://$MODULE_DIR$/build/intermediates/classes/test/debug" />
  <exclude-output />
  <content url="file:https://$MODULE_DIR$">
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/res" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/resources" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -56,35 +57,54 @@
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/res" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/resources" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/assets" type="java-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/java" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/rs" isTestSource="false" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/res" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/java" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/rs" isTestSource="true" />
  <sourceFolder url="file:https://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <sourceFolder url="file:https://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/annotations" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/attr" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/blame" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/bundles" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/check-manifest" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/extractedTypedefs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/intermediate-jars" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/javaPrecompile" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/jniLibs" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/lint" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/packaged-aidl" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/packaged-classes" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/packagedAssets" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/packaged_res" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/public_res" />
+ <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/publish-proguard" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/res" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/rs" />
  <excludeFolder url="file:https://$MODULE_DIR$/build/intermediates/shaders" />

sqlite3/src/main/jni/Android.mk

@@ -1,4 +1,3 @@
 
 LOCAL_PATH:= $(call my-dir)
 include $(LOCAL_PATH)/sqlite/Android.mk
-

sqlite3/src/main/jni/Application.mk

@@ -1,2 +1,2 @@
 APP_STL:=stlport_static
-APP_ABI := arm64-v8a
+APP_ABI := armeabi-v7a arm64-v8a

sqlite3/src/main/jni/sqlite/Android.mk

@@ -53,9 +53,17 @@ $(info LOCAL_C_INCLUDES = $(LOCAL_C_INCLUDES))
 LOCAL_MODULE:= libsqliteX
 LOCAL_LDLIBS += -ldl -llog
 
-LOCAL_LIB := $(LOCAL_PATH)/icu_lib
+# Local lib
+$(info TARGET_ARCH = $(TARGET_ARCH))
 
-# IMPORTANT -licudata must placed after -licuuc
+ifeq ($(TARGET_ARCH), arm)
+ LOCAL_LIB := $(LOCAL_PATH)/icu_lib_armv7
+else
+ LOCAL_LIB := $(LOCAL_PATH)/icu_lib_arm64
+endif
+
+
+# IMPORTANT -licudata must be placed after -licuuc
 LOCAL_LDLIBS += -L$(LOCAL_LIB) -licui18n -licuio -licutu -licuuc -licudata
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)

sqlite3test/build.gradle

@@ -2,14 +2,17 @@ apply plugin: 'com.android.application'
 
 android {
  compileSdkVersion 23
- buildToolsVersion '25.0.2'
 
  defaultConfig {
  applicationId "org.sqlite.customsqlitetest"
  minSdkVersion 16
  targetSdkVersion 23
  versionCode 1
  versionName "1.0"
+
+ ndk {
+ abiFilters 'armeabi-v7a'
+ }
  }
  buildTypes {
  release {
@@ -20,7 +23,7 @@ android {
 }
 
 dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:appcompat-v7:23.4.0'
- compile project(':sqlite3')
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+ implementation 'com.android.support:appcompat-v7:23.4.0'
+ implementation project(':sqlite3')
 }