From 1aa9732294fc944089d6ae5688ce0f8f573d94f0 Mon Sep 17 00:00:00 2001 From: JohnE Date: Tue, 19 Feb 2019 10:30:03 -0800 Subject: [PATCH] MOD: updating build prefs to test the ndk lib --- ccc-jni/build.gradle | 27 ++++++++++--------- .../main/java/io/malloc/ccc/MainActivity.java | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ccc-jni/build.gradle b/ccc-jni/build.gradle index f1b58a5..04908ce 100644 --- a/ccc-jni/build.gradle +++ b/ccc-jni/build.gradle @@ -12,13 +12,13 @@ android { versionCode 1 versionName '1.0' - externalNativeBuild { - cmake { - arguments '-DANDROID_PLATFORM=android-23', - '-DANDROID_TOOLCHAIN=clang', - '-DANDROID_STL=c++_static' - } - } + // externalNativeBuild { + // cmake { + // arguments '-DANDROID_PLATFORM=android-23', + // '-DANDROID_TOOLCHAIN=clang', + // '-DANDROID_STL=c++_static' + // } + // } } buildTypes { release { @@ -33,11 +33,11 @@ android { jniLibs.srcDirs = ['libs/wolfssl-jni'] } } - externalNativeBuild { - cmake { - path 'CMakeLists.txt' - } - } + // externalNativeBuild { + // cmake { + // path 'CMakeLists.txt' + // } + // } } // Copies files to the dist/ folder, adds a timestamp @@ -57,7 +57,8 @@ task copyLibs(type: Copy) { } dependencies { - testImplementation 'junit:junit:4.12' + // testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:28.0.0' } // tasks.whenTaskAdded { task -> 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 0ec1dc6..3886a41 100644 --- a/ccc-jni/src/main/java/io/malloc/ccc/MainActivity.java +++ b/ccc-jni/src/main/java/io/malloc/ccc/MainActivity.java @@ -21,7 +21,7 @@ public class MainActivity extends AppCompatActivity { } public native String stringFromJNI(); static { - System.loadLibrary("hello-libs"); + System.loadLibrary("wolfssl-jni"); } }