[sword-svn] r3589 - in trunk/bindings: Android Android/SWORD Android/SWORD/app cordova/org.crosswire.sword.cordova.SWORD java-jni/jni
scribe at crosswire.org
scribe at crosswire.org
Sun Jun 17 09:33:14 MST 2018
Author: scribe
Date: 2018-06-17 09:33:13 -0700 (Sun, 17 Jun 2018)
New Revision: 3589
Modified:
trunk/bindings/Android/Makefile
trunk/bindings/Android/SWORD/app/build.gradle
trunk/bindings/Android/SWORD/build.gradle
trunk/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml
trunk/bindings/java-jni/jni/swordstub.cpp
Log:
updated to use shared std c++ libs and latest versions of SDK
Modified: trunk/bindings/Android/Makefile
===================================================================
--- trunk/bindings/Android/Makefile 2018-06-16 14:21:48 UTC (rev 3588)
+++ trunk/bindings/Android/Makefile 2018-06-17 16:33:13 UTC (rev 3589)
@@ -1,8 +1,11 @@
all: javawrapper
+ rm -rf ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/*
cp -a SWORD/app/build/intermediates/transforms/stripDebugSymbol/release/0/lib/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/
debug: javawrapper
- cp -a SWORD/app/build/intermediates/cmake/debug/obj/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/
+ rm -rf ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/*
+# cp -a SWORD/app/build/intermediates/cmake/debug/obj/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/
+ cp -a SWORD/app/build/intermediates/cmake/release/obj/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/
javawrapper:
cp -a SWORD/app/src/main/java/org/crosswire/android/sword/* ../cordova/org.crosswire.sword.cordova.SWORD/src/android/
Modified: trunk/bindings/Android/SWORD/app/build.gradle
===================================================================
--- trunk/bindings/Android/SWORD/app/build.gradle 2018-06-16 14:21:48 UTC (rev 3588)
+++ trunk/bindings/Android/SWORD/app/build.gradle 2018-06-17 16:33:13 UTC (rev 3589)
@@ -1,19 +1,21 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
+ compileSdkVersion 27
buildToolsVersion '27.0.3'
defaultConfig {
applicationId "org.crosswire.sword"
minSdkVersion 14
- targetSdkVersion 26
+ targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
cppFlags "-frtti -fexceptions"
- arguments "-DANDROID_STL=c++_static"
+ arguments "-DANDROID_STL=c++_shared"
+// arguments "-DANDROID_STL=stlport_shared"
+// arguments "-DANDROID_STL=c++_shared" /*"-DANDROID_STL=stlport_shared" "-DCMAKE_BUILD_TYPE=Debug"*/
}
}
}
@@ -31,12 +33,8 @@
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- compile 'com.android.support:appcompat-v7:25.3.0'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile 'com.android.support:design:25.3.0'
- testCompile 'junit:junit:4.12'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support:appcompat-v7:27.1.1'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+ implementation 'com.android.support:design:27.1.1'
}
Modified: trunk/bindings/Android/SWORD/build.gradle
===================================================================
--- trunk/bindings/Android/SWORD/build.gradle 2018-06-16 14:21:48 UTC (rev 3588)
+++ trunk/bindings/Android/SWORD/build.gradle 2018-06-17 16:33:13 UTC (rev 3589)
@@ -6,7 +6,7 @@
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.2'
+ classpath 'com.android.tools.build:gradle:3.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Modified: trunk/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml
===================================================================
--- trunk/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml 2018-06-16 14:21:48 UTC (rev 3588)
+++ trunk/bindings/cordova/org.crosswire.sword.cordova.SWORD/plugin.xml 2018-06-17 16:33:13 UTC (rev 3589)
@@ -56,6 +56,17 @@
<source-file src="libs/android/armeabi-v7a/libsword.so" target-dir="libs/armeabi-v7a" />
<source-file src="libs/android/x86/libsword.so" target-dir="libs/x86" />
<source-file src="libs/android/x86_64/libsword.so" target-dir="libs/x86_64" />
+
+ <source-file src="libs/android/arm64-v8a/libc++_shared.so" target-dir="libs/arm64-v8a" />
+ <source-file src="libs/android/armeabi-v7a/libc++_shared.so" target-dir="libs/armeabi-v7a" />
+ <source-file src="libs/android/x86/libc++_shared.so" target-dir="libs/x86" />
+ <source-file src="libs/android/x86_64/libc++_shared.so" target-dir="libs/x86_64" />
+<!--
+ <source-file src="libs/android/arm64-v8a/libstlport_shared.so" target-dir="libs/arm64-v8a" />
+ <source-file src="libs/android/armeabi-v7a/libstlport_shared.so" target-dir="libs/armeabi-v7a" />
+ <source-file src="libs/android/x86/libstlport_shared.so" target-dir="libs/x86" />
+ <source-file src="libs/android/x86_64/libstlport_shared.so" target-dir="libs/x86_64" />
+-->
<!-- I think these are old names
<source-file src="libs/android/armeabi/libsword.so" target-dir="libs/armeabi" />
<source-file src="libs/android/mips64/libsword.so" target-dir="libs/mips64" />
Modified: trunk/bindings/java-jni/jni/swordstub.cpp
===================================================================
--- trunk/bindings/java-jni/jni/swordstub.cpp 2018-06-16 14:21:48 UTC (rev 3588)
+++ trunk/bindings/java-jni/jni/swordstub.cpp 2018-06-17 16:33:13 UTC (rev 3589)
@@ -1104,6 +1104,7 @@
const char *level2 = env->GetStringUTFChars(level2JS, NULL);
const char *level3 = env->GetStringUTFChars(level3JS, NULL);
bool filtered = (filteredJS == JNI_TRUE);
+SWLog::getSystemLog()->logDebug("calling getEntryAttributes(%s, %s, %s, %s", level1, level2, level3, (filtered?"true":"false"));
jclass clazzString = env->FindClass("java/lang/String");
jobjectArray ret = 0;
More information about the sword-cvs
mailing list