refs #35, #37 Fix build issue, add x86 and armeabi-v7 support

Author: truedat101

android/CCNx-Android-Services/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rtc.ccnx.droid"
-      android:versionCode="180"
-	  android:versionName="0.8.0-wip1">
+      android:versionCode="181"
+	  android:versionName="0.8.0-wip2">
 
     <application android:icon="@drawable/ic_launcher" android:label="@string/app_name">
         <activity android:name=".Controller"

android/CCNx-Android-Services/RELEASE_NOTES.txt

@@ -1,6 +1,8 @@
 0.8.0
 =====
 * refs #36 Prepare CCNxTxRxRelay 0.8.0 to publish to Google Play Store
+* refs #35 CCNxTxRxRelay - add support for x86 abi, arm, armv7a, and mips
+* refs #37 Fix CCNxTxRxRelay merge issues between 0.7.2 and 0.8.0
 
 0.7.2
 =====

android/CCNx-Android-Services/jni/Application.mk

@@ -17,9 +17,10 @@
 APP_PLATFORM := android-5
 
 # Set APP_ABI
-# You should this if you need other arm or x86 or mips ABIs
-# left blank, default is just for armeabi
-# APP_ABI := armeabi armeabi-v7a
+# You should comment this out this out if you only need the default
+# default is just for armeabi
+# Triples build time for JNI code and increases code size for JNI lib by 3x
+APP_ABI := armeabi armeabi-v7a x86
 # For the purposes of most builds it is recommended not to set this unless you
 # intend to target a specific CPU Architecture supported by the Android NDK.
 # Please review ANDROID_NDK docs/CPU-ARCH-ABIS.html for more information.

android/CCNx-Android-Services/src/com/rtc/ccnx/droid/ccnd/CcndService.java

@@ -206,10 +206,26 @@ protected void createKeystore(String dir_name, String keystore_name) {
 			// subsequent attempts to start up this service (manual or via intent), we should
 			CCNxLibraryCheck.checkBCP();	   
 			FileOutputStream stream = new FileOutputStream(try_keystore);
-			BasicKeyManager.createKeyStore(stream, null, null, "ccnd", KEYSTORE_PASS, "CCND");
+			// BasicKeyManager.createKeyStore(OutputStream,Key,String,String,char[],String) is not applicable
+			BasicKeyManager.createKeyStore(stream,
+											null,
+											null,
+											"ccnd", 
+											KEYSTORE_PASS, 
+											"CCND");
+			/* CCNWrappedKeyStore createKeyStore(OutputStream keystoreWriteStream, Key key,
+											 String keyStoreType, String keyAlias,
+											 char [] password,
+											 String userName) throws ConfigurationException, IOException {
+			*/
 			stream.close();
 			stream = new FileOutputStream(new File(dir, ".ccnd_keystore"));
-			BasicKeyManager.createKeyStore(stream, null, "ccndadmin", "Ccndadm1n#".toCharArray(), "ccndadmin"); // XXX Put this password and username into prefs/options
+			BasicKeyManager.createKeyStore(stream,
+											null,
+											null,
+											"ccndadmin",
+											"Ccndadm1n#".toCharArray(),
+											"ccndadmin"); // XXX Put this password and username into prefs/options
 			stream.close();
 		} catch(RuntimeException rte) {
 			// There are a few which can fail and this makes the service unstable since