diff --git a/ccc-jni/build.gradle b/ccc-jni/build.gradle
index 04908ce..e020ce1 100644
--- a/ccc-jni/build.gradle
+++ b/ccc-jni/build.gradle
@@ -30,7 +30,7 @@ android {
sourceSets {
main {
// let gradle pack the shared library into apk
- jniLibs.srcDirs = ['libs/wolfssl-jni']
+ jniLibs.srcDirs = ['lib/wolfssl-jni']
}
}
// externalNativeBuild {
@@ -57,8 +57,9 @@ task copyLibs(type: Copy) {
}
dependencies {
- // testImplementation 'junit:junit:4.12'
+ implementation project(":wolfssl-jni")
implementation 'com.android.support:appcompat-v7:28.0.0'
+ // testImplementation 'junit:junit:4.12'
}
// tasks.whenTaskAdded { task ->
diff --git a/ccc-jni/libs/wolfssl-jni/arm64-v8a/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/arm64-v8a/libwolfssl-jni.so
similarity index 100%
rename from ccc-jni/libs/wolfssl-jni/arm64-v8a/libwolfssl-jni.so
rename to ccc-jni/lib/wolfssl-jni/arm64-v8a/libwolfssl-jni.so
diff --git a/ccc-jni/libs/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so
similarity index 100%
rename from ccc-jni/libs/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so
rename to ccc-jni/lib/wolfssl-jni/armeabi-v7a/libwolfssl-jni.so
diff --git a/ccc-jni/libs/wolfssl-jni/lib_history b/ccc-jni/lib/wolfssl-jni/lib_history
similarity index 100%
rename from ccc-jni/libs/wolfssl-jni/lib_history
rename to ccc-jni/lib/wolfssl-jni/lib_history
diff --git a/ccc-jni/libs/wolfssl-jni/x86/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/x86/libwolfssl-jni.so
similarity index 100%
rename from ccc-jni/libs/wolfssl-jni/x86/libwolfssl-jni.so
rename to ccc-jni/lib/wolfssl-jni/x86/libwolfssl-jni.so
diff --git a/ccc-jni/libs/wolfssl-jni/x86_64/libwolfssl-jni.so b/ccc-jni/lib/wolfssl-jni/x86_64/libwolfssl-jni.so
similarity index 100%
rename from ccc-jni/libs/wolfssl-jni/x86_64/libwolfssl-jni.so
rename to ccc-jni/lib/wolfssl-jni/x86_64/libwolfssl-jni.so
diff --git a/ccc-jni/libs/wolfssl-lib/arm64-v8a/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/arm64-v8a/libwolfssl.a
similarity index 100%
rename from ccc-jni/libs/wolfssl-lib/arm64-v8a/libwolfssl.a
rename to ccc-jni/lib/wolfssl-lib/arm64-v8a/libwolfssl.a
diff --git a/ccc-jni/libs/wolfssl-lib/armeabi-v7a/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/armeabi-v7a/libwolfssl.a
similarity index 100%
rename from ccc-jni/libs/wolfssl-lib/armeabi-v7a/libwolfssl.a
rename to ccc-jni/lib/wolfssl-lib/armeabi-v7a/libwolfssl.a
diff --git a/ccc-jni/libs/wolfssl-lib/lib_history b/ccc-jni/lib/wolfssl-lib/lib_history
similarity index 100%
rename from ccc-jni/libs/wolfssl-lib/lib_history
rename to ccc-jni/lib/wolfssl-lib/lib_history
diff --git a/ccc-jni/libs/wolfssl-lib/x86/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/x86/libwolfssl.a
similarity index 100%
rename from ccc-jni/libs/wolfssl-lib/x86/libwolfssl.a
rename to ccc-jni/lib/wolfssl-lib/x86/libwolfssl.a
diff --git a/ccc-jni/libs/wolfssl-lib/x86_64/libwolfssl.a b/ccc-jni/lib/wolfssl-lib/x86_64/libwolfssl.a
similarity index 100%
rename from ccc-jni/libs/wolfssl-lib/x86_64/libwolfssl.a
rename to ccc-jni/lib/wolfssl-lib/x86_64/libwolfssl.a
diff --git a/ccc-jni/src/main/java/io/malloc/ccc/MainActivity.java b/ccc-jni/src/main/java/io/malloc/ccc/MainActivity.java
index 3886a41..682c0cb 100644
--- a/ccc-jni/src/main/java/io/malloc/ccc/MainActivity.java
+++ b/ccc-jni/src/main/java/io/malloc/ccc/MainActivity.java
@@ -6,6 +6,9 @@ package io.malloc.ccc;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.TextView;
+
+import com.wolfssl.wolfcrypt.Aes;
+
/*
* Simple Java UI to trigger jni function. It is exactly same as Java code
* in hello-jni.
@@ -23,5 +26,6 @@ public class MainActivity extends AppCompatActivity {
static {
System.loadLibrary("wolfssl-jni");
}
-
}
+
+
diff --git a/ccc-jni/src/main/res/layout/activity_main.xml b/ccc-jni/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..2c54518
--- /dev/null
+++ b/ccc-jni/src/main/res/layout/activity_main.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/ccc-jni/src/main/res/mipmap-hdpi/ic_launcher.png b/ccc-jni/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
Binary files /dev/null and b/ccc-jni/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/ccc-jni/src/main/res/mipmap-mdpi/ic_launcher.png b/ccc-jni/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..c133a0c
Binary files /dev/null and b/ccc-jni/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/ccc-jni/src/main/res/mipmap-xhdpi/ic_launcher.png b/ccc-jni/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..bfa42f0
Binary files /dev/null and b/ccc-jni/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/ccc-jni/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ccc-jni/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and b/ccc-jni/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/ccc-jni/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ccc-jni/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and b/ccc-jni/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/ccc-jni/src/main/res/values-w820dp/dimens.xml b/ccc-jni/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/ccc-jni/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 64dp
+
diff --git a/ccc-jni/src/main/res/values/colors.xml b/ccc-jni/src/main/res/values/colors.xml
new file mode 100644
index 0000000..3ab3e9c
--- /dev/null
+++ b/ccc-jni/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+
+
+ #3F51B5
+ #303F9F
+ #FF4081
+
diff --git a/ccc-jni/src/main/res/values/dimens.xml b/ccc-jni/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/ccc-jni/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff --git a/ccc-jni/src/main/res/values/strings.xml b/ccc-jni/src/main/res/values/strings.xml
index 6f9cac4..0219a69 100644
--- a/ccc-jni/src/main/res/values/strings.xml
+++ b/ccc-jni/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
- Copius Cipher Chain
+ hello-libs
diff --git a/ccc-jni/src/main/res/values/styles.xml b/ccc-jni/src/main/res/values/styles.xml
new file mode 100644
index 0000000..5885930
--- /dev/null
+++ b/ccc-jni/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/settings.gradle b/settings.gradle
index f191af2..4d5306b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,5 @@
-include ':wolfssl-lib'
-include ':wolfssl-jni'
+// include this at the top, for shared libraries
+include ':ccc-jni', ':wolfssl-jni'
+// include ':wolfssl-lib'
+// include ':wolfssl-jni'
include ':ccc-jni'
diff --git a/wolfssl-jni/build.gradle b/wolfssl-jni/build.gradle
index b90ecf7..5d07fb2 100644
--- a/wolfssl-jni/build.gradle
+++ b/wolfssl-jni/build.gradle
@@ -6,6 +6,7 @@ android {
buildToolsVersion '28.0.3'
defaultConfig {
+ // no applicationId with a library
// applicationId 'xyz.nc.android.wc'
minSdkVersion 23
targetSdkVersion 28
@@ -45,5 +46,5 @@ task copyLibs(type: Copy) {
dependencies {
- testImplementation 'junit:junit:4.12'
+ // testImplementation 'junit:junit:4.12'
}