From d1218f34d2d77d55136ab430b8950cd4f6ee6338 Mon Sep 17 00:00:00 2001 From: JohnE Date: Thu, 6 Apr 2017 09:37:51 -0700 Subject: [PATCH] UPD: updated the android build tools --- README | 15 ++++++++++++ app/build.gradle | 6 ++--- build.gradle | 5 +--- docs/nc-wc-ndk_dev | 31 ++++++++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 +-- 5 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..c8e503d --- /dev/null +++ b/README @@ -0,0 +1,15 @@ +**** ***** ***** ***** +*** Next Crypto *** +***** ***** ***** ***** + + +[[ Features ]] +-uses gradle to build native files +-uses NEW CMake (CMake Android plugin) +-AEAD crypto support +-NO LEGACY. removes legacy crypto support +-WolfSSL crypto engine + -FIPS-140 ver available +-Quantum-Computing safe crypto + -super-fast NTRU algorithm + diff --git a/app/build.gradle b/app/build.gradle index a08ac5e..d647163 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { // set these default settings externalNativeBuild { //arguments "-DVAR_NAME=VALUE" - arguments '-DANDROID_TOOLCHAIN=clang' + //arguments '-DANDROID_TOOLCHAIN=clang' //arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static', '-DANDROID_PLATFORM=android-21' //arguments '-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=c++_static', '-DANDROID_PLATFORM=android-22' } @@ -37,7 +37,7 @@ android { // cmake build configuration cmake { // relative path to CMake build script - path 'src/main/cpp/CMakeLists.txt' + //path 'src/main/cpp/CMakeLists.txt' // Passes optional arguments to CMake. //arguments "-DANDROID_ARM_NEON=TRUE", "-DANDROID_TOOLCHAIN=clang" @@ -117,7 +117,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.1.0' + compile 'com.android.support:appcompat-v7:25.2.0' testCompile 'junit:junit:4.12' } diff --git a/build.gradle b/build.gradle index edf51cc..2e9fd1f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,11 +6,8 @@ buildscript { } dependencies { // gradle tools 2.2.2+ supports stable ndk - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' //classpath "com.android.tools.build:gradle-experimental:0.7.0-alpha4" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } diff --git a/docs/nc-wc-ndk_dev b/docs/nc-wc-ndk_dev index 563ba67..4840862 100644 --- a/docs/nc-wc-ndk_dev +++ b/docs/nc-wc-ndk_dev @@ -1,5 +1,12 @@ [[[ NC WC Dev Notes ]]] +[ Info ] +-uses latest gradle android plug with: "externalNativeBuild" +-cmake build tools + + + + [[ Links ]] # gradle plugin versions @@ -24,3 +31,27 @@ @ https://github.com/googlesamples/android-ndk + +[[ Java Version ]] + +[ NDK ] +/usr/local/opt/android-sdk/ndk-bundle + +[ SDK ] +/usr/local/opt/android-sdk/ --> +/Applications/android-dev/android-sdk-macosx + +[ Java ] +Android Studio 2.3 RC 1 +Build #AI-162.3742087, built on February 16, 2017 +JRE: 1.8.0_112-release-b06 x86_64 +JVM: OpenJDK 64-Bit Server VM by JetBrains s.r.o + +/Library/Java/JavaVirtualMachines/jdk1.8.0_20.jdk/Contents/Home + + +[ Android Gradle Plugin ] + + +To take advantage of all the latest features (such as Instant Run), improvements and security fixes, we strongly recommend that you update the Android Gradle plugin to version 2.3.0-rc1 and Gradle to version 3.3. + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df77e14..feae331 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 21 12:43:19 PST 2017 +#Sun Feb 26 23:05:09 PST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip