Skip to content

Commit 139d6a4

Browse files
committed
refs #35, #37 Fix build issue, add x86 and armeabi-v7 support
1 parent 60f8885 commit 139d6a4

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

android/CCNx-Android-Services/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.rtc.ccnx.droid"
4-
android:versionCode="180"
5-
android:versionName="0.8.0-wip1">
4+
android:versionCode="181"
5+
android:versionName="0.8.0-wip2">
66

77
<application android:icon="@drawable/ic_launcher" android:label="@string/app_name">
88
<activity android:name=".Controller"

android/CCNx-Android-Services/RELEASE_NOTES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
0.8.0
22
=====
33
* refs #36 Prepare CCNxTxRxRelay 0.8.0 to publish to Google Play Store
4+
* refs #35 CCNxTxRxRelay - add support for x86 abi, arm, armv7a, and mips
5+
* refs #37 Fix CCNxTxRxRelay merge issues between 0.7.2 and 0.8.0
46

57
0.7.2
68
=====

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
APP_PLATFORM := android-5
1818

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

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,26 @@ protected void createKeystore(String dir_name, String keystore_name) {
206206
// subsequent attempts to start up this service (manual or via intent), we should
207207
CCNxLibraryCheck.checkBCP();
208208
FileOutputStream stream = new FileOutputStream(try_keystore);
209-
BasicKeyManager.createKeyStore(stream, null, null, "ccnd", KEYSTORE_PASS, "CCND");
209+
// BasicKeyManager.createKeyStore(OutputStream,Key,String,String,char[],String) is not applicable
210+
BasicKeyManager.createKeyStore(stream,
211+
null,
212+
null,
213+
"ccnd",
214+
KEYSTORE_PASS,
215+
"CCND");
216+
/* CCNWrappedKeyStore createKeyStore(OutputStream keystoreWriteStream, Key key,
217+
String keyStoreType, String keyAlias,
218+
char [] password,
219+
String userName) throws ConfigurationException, IOException {
220+
*/
210221
stream.close();
211222
stream = new FileOutputStream(new File(dir, ".ccnd_keystore"));
212-
BasicKeyManager.createKeyStore(stream, null, "ccndadmin", "Ccndadm1n#".toCharArray(), "ccndadmin"); // XXX Put this password and username into prefs/options
223+
BasicKeyManager.createKeyStore(stream,
224+
null,
225+
null,
226+
"ccndadmin",
227+
"Ccndadm1n#".toCharArray(),
228+
"ccndadmin"); // XXX Put this password and username into prefs/options
213229
stream.close();
214230
} catch(RuntimeException rte) {
215231
// There are a few which can fail and this makes the service unstable since

0 commit comments

Comments
 (0)