[sword-svn] r3522 - in trunk/bindings: Android java-jni/jni

[scribe at crosswire.org]

Author: scribe
Date: 2017-11-05 12:58:28 -0700 (Sun, 05 Nov 2017)
New Revision: 3522

Modified:
   trunk/bindings/Android/Makefile
   trunk/bindings/java-jni/jni/swordstub.cpp
Log:
Changed android bindings release target to grab stripped libs.  Added new option for getEntryAttributes to allow for x/y/* which will return a list of key=value entries.

Modified: trunk/bindings/Android/Makefile
===================================================================
--- trunk/bindings/Android/Makefile	2017-11-05 10:09:37 UTC (rev 3521)
+++ trunk/bindings/Android/Makefile	2017-11-05 19:58:28 UTC (rev 3522)
@@ -2,7 +2,7 @@
 	cp -a SWORD/app/build/intermediates/cmake/debug/obj/* ../cordova/org.crosswire.sword.cordova.SWORD/libs/android/
 
 release: javawrapper
-	cp -a SWORD/app/build/intermediates/cmake/release/obj/* ../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/
 
 javawrapper:
 	cp -a SWORD/app/src/main/java/org/crosswire/android/sword/* ../cordova/org.crosswire.sword.cordova.SWORD/src/android/

Modified: trunk/bindings/java-jni/jni/swordstub.cpp
===================================================================
--- trunk/bindings/java-jni/jni/swordstub.cpp	2017-11-05 10:09:37 UTC (rev 3521)
+++ trunk/bindings/java-jni/jni/swordstub.cpp	2017-11-05 19:58:28 UTC (rev 3522)
@@ -1085,7 +1085,8 @@
 						results.push_back(i2Start->first);
 					}
 					else {
-						if (level3 && *level3 && *level3 != '-') {
+						// allow '-' to get all keys; allow '*' to get all key=value
+						if (level3 && *level3 && *level3 != '-' && *level3 != '*') {
 							i3Start = i2Start->second.find(level3);
 							i3End = i3Start;
 							if (i3End != i2Start->second.end())
@@ -1099,6 +1100,9 @@
 							if (level3 && *level3 && *level3 == '-') {
 								results.push_back(i3Start->first);
 							}
+							else if (level3 && *level3 && *level3 == '*') {
+								results.push_back(i3Start->first + "=" + i3Start->second);
+							}
 							else {
 								results.push_back(i3Start->second);
 							}