diff --git a/.gitmodules b/.gitmodules
index e76d844f..014d8f52 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,9 @@
[submodule "android/wolfssljni-ndk-sample/wolfssljni"]
path = android/wolfssljni-ndk-sample/wolfssljni
url = https://github.com/wolfSSL/wolfssljni.git
+[submodule "android/wolfssljni-ndk-gradle/wolfssl"]
+ path = android/wolfssljni-ndk-gradle/wolfssl
+ url = https://github.com/wolfSSL/wolfssl.git
+[submodule "android/wolfssljni-ndk-gradle/wolfssljni"]
+ path = android/wolfssljni-ndk-gradle/wolfssljni
+ url = https://github.com/wolfSSL/wolfssljni.git
diff --git a/android/wolfssljni-ndk-gradle/app/CMakeLists.txt b/android/wolfssljni-ndk-gradle/app/CMakeLists.txt
new file mode 100644
index 00000000..7e508332
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/CMakeLists.txt
@@ -0,0 +1,105 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Add preprocessor defines to CFLAGS
+add_definitions(-DWOLFSSL_JNI -DWOLFSSL_DTLS -DOPENSSL_EXTRA -DHAVE_CRL -DHAVE_CRL_MONITOR
+ -DHAVE_OCSP -DPERSIST_SESSION_CACHE -DPERSIST_CERT_CACHE -DATOMIC_USER
+ -DHAVE_ECC -DTFM_ECC256 -DHAVE_PK_CALLBACKS -DHAVE_DH -DUSE_FAST_MATH
+ -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING -DTFM_NO_ASM
+ )
+
+# set wolfSSL JNI location as environment variable, change if needed
+set(wolfssljni_DIR ${CMAKE_SOURCE_DIR}/../wolfssljni)
+set(wolfssl_DIR ${CMAKE_SOURCE_DIR}/../wolfssl)
+
+# Add header directories to include paths
+include_directories(
+ ${wolfssl_DIR}
+ ${wolfssljni_DIR}/native
+ )
+
+# Add wolfSSL library source files, to be compiled as SHARED library
+add_library(wolfssl SHARED
+ ${wolfssl_DIR}/wolfcrypt/src/aes.c
+ ${wolfssl_DIR}/wolfcrypt/src/arc4.c
+ ${wolfssl_DIR}/wolfcrypt/src/asm.c
+ ${wolfssl_DIR}/wolfcrypt/src/asn.c
+ ${wolfssl_DIR}/wolfcrypt/src/blake2b.c
+ ${wolfssl_DIR}/wolfcrypt/src/camellia.c
+ ${wolfssl_DIR}/wolfcrypt/src/chacha.c
+ ${wolfssl_DIR}/wolfcrypt/src/chacha20_poly1305.c
+ ${wolfssl_DIR}/wolfcrypt/src/cmac.c
+ ${wolfssl_DIR}/wolfcrypt/src/coding.c
+ ${wolfssl_DIR}/wolfcrypt/src/compress.c
+ ${wolfssl_DIR}/wolfcrypt/src/cpuid.c
+ ${wolfssl_DIR}/wolfcrypt/src/curve25519.c
+ ${wolfssl_DIR}/wolfcrypt/src/des3.c
+ ${wolfssl_DIR}/wolfcrypt/src/dh.c
+ ${wolfssl_DIR}/wolfcrypt/src/dsa.c
+ ${wolfssl_DIR}/wolfcrypt/src/ecc.c
+ ${wolfssl_DIR}/wolfcrypt/src/ecc_fp.c
+ ${wolfssl_DIR}/wolfcrypt/src/ed25519.c
+ ${wolfssl_DIR}/wolfcrypt/src/error.c
+ ${wolfssl_DIR}/wolfcrypt/src/fe_low_mem.c
+ ${wolfssl_DIR}/wolfcrypt/src/fe_operations.c
+ ${wolfssl_DIR}/wolfcrypt/src/ge_low_mem.c
+ ${wolfssl_DIR}/wolfcrypt/src/ge_operations.c
+ ${wolfssl_DIR}/wolfcrypt/src/hash.c
+ ${wolfssl_DIR}/wolfcrypt/src/hc128.c
+ ${wolfssl_DIR}/wolfcrypt/src/hmac.c
+ ${wolfssl_DIR}/wolfcrypt/src/idea.c
+ ${wolfssl_DIR}/wolfcrypt/src/integer.c
+ ${wolfssl_DIR}/wolfcrypt/src/logging.c
+ ${wolfssl_DIR}/wolfcrypt/src/md2.c
+ ${wolfssl_DIR}/wolfcrypt/src/md4.c
+ ${wolfssl_DIR}/wolfcrypt/src/md5.c
+ ${wolfssl_DIR}/wolfcrypt/src/memory.c
+ ${wolfssl_DIR}/wolfcrypt/src/pkcs12.c
+ ${wolfssl_DIR}/wolfcrypt/src/pkcs7.c
+ ${wolfssl_DIR}/wolfcrypt/src/poly1305.c
+ ${wolfssl_DIR}/wolfcrypt/src/pwdbased.c
+ ${wolfssl_DIR}/wolfcrypt/src/rabbit.c
+ ${wolfssl_DIR}/wolfcrypt/src/random.c
+ ${wolfssl_DIR}/wolfcrypt/src/ripemd.c
+ ${wolfssl_DIR}/wolfcrypt/src/rsa.c
+ ${wolfssl_DIR}/wolfcrypt/src/sha.c
+ ${wolfssl_DIR}/wolfcrypt/src/sha256.c
+ ${wolfssl_DIR}/wolfcrypt/src/sha3.c
+ ${wolfssl_DIR}/wolfcrypt/src/sha512.c
+ ${wolfssl_DIR}/wolfcrypt/src/signature.c
+ ${wolfssl_DIR}/wolfcrypt/src/srp.c
+ ${wolfssl_DIR}/wolfcrypt/src/tfm.c
+ ${wolfssl_DIR}/wolfcrypt/src/wc_encrypt.c
+ ${wolfssl_DIR}/wolfcrypt/src/wc_port.c
+ ${wolfssl_DIR}/wolfcrypt/src/wolfevent.c
+ ${wolfssl_DIR}/wolfcrypt/src/wolfmath.c
+ ${wolfssl_DIR}/src/crl.c
+ ${wolfssl_DIR}/src/internal.c
+ ${wolfssl_DIR}/src/io.c
+ ${wolfssl_DIR}/src/keys.c
+ ${wolfssl_DIR}/src/ocsp.c
+ ${wolfssl_DIR}/src/sniffer.c
+ ${wolfssl_DIR}/src/ssl.c
+ ${wolfssl_DIR}/src/tls.c
+ ${wolfssl_DIR}/src/tls13.c
+ )
+
+# Add wolfSSL JNI library native source files, to be compiled as SHARED library
+# wolfSSL JNI Java files are tied into build in Module build.gradle file
+add_library(wolfssljni SHARED
+ ${wolfssljni_DIR}/native/com_wolfssl_wolfcrypt_ECC.c
+ ${wolfssljni_DIR}/native/com_wolfssl_wolfcrypt_RSA.c
+ ${wolfssljni_DIR}/native/com_wolfssl_WolfSSL.c
+ ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLContext.c
+ ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLSession.c
+ )
+
+# Include libraries needed for wolfSSL and wolfSSL JNI libs
+target_link_libraries(wolfssljni
+ wolfssl
+ android
+ log)
diff --git a/android/wolfssljni-ndk-gradle/app/app.iml b/android/wolfssljni-ndk-gradle/app/app.iml
new file mode 100644
index 00000000..ad5e97e6
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/app.iml
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/wolfssljni-ndk-gradle/app/build.gradle b/android/wolfssljni-ndk-gradle/app/build.gradle
new file mode 100644
index 00000000..92ba414c
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/build.gradle
@@ -0,0 +1,45 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 25
+ buildToolsVersion "25.0.2"
+ defaultConfig {
+ applicationId "com.wolfssl.wolfssl_ndk_gradle"
+ minSdkVersion 24
+ targetSdkVersion 25
+ versionCode 1
+ versionName "1.0"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ externalNativeBuild {
+ cmake {
+ cppFlags ""
+ }
+ }
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+ externalNativeBuild {
+ cmake {
+ path "CMakeLists.txt"
+ }
+ }
+
+ sourceSets {
+ // wolfSSL JNI Java source files are added here
+ main.java.srcDirs += 'src/main/../../../wolfssljni/src/java'
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ })
+ compile 'com.android.support:appcompat-v7:25.3.1'
+ compile 'com.android.support.constraint:constraint-layout:1.0.2'
+ testCompile 'junit:junit:4.12'
+}
diff --git a/android/wolfssljni-ndk-gradle/app/proguard-rules.pro b/android/wolfssljni-ndk-gradle/app/proguard-rules.pro
new file mode 100644
index 00000000..80d73448
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/chrisc/android/android-sdk-macosx/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/AndroidManifest.xml b/android/wolfssljni-ndk-gradle/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..88da7eaa
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/java/com/wolfssl/wolfssljni_ndk_gradle/MainActivity.java b/android/wolfssljni-ndk-gradle/app/src/main/java/com/wolfssl/wolfssljni_ndk_gradle/MainActivity.java
new file mode 100644
index 00000000..ddd7e1f9
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/src/main/java/com/wolfssl/wolfssljni_ndk_gradle/MainActivity.java
@@ -0,0 +1,32 @@
+package com.wolfssl.wolfssljni_ndk_gradle;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.wolfssl.WolfSSL;
+
+public class MainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ TextView tv = (TextView) findViewById(R.id.sample_text);
+ tv.setText("wolfSSL JNI Android Studio Example App");
+
+ /* calling an API here to make sure library is linked */
+ try {
+ WolfSSL wolflib = new WolfSSL();
+ tv.append("\r\n... initialized WolfSSL object");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ static {
+ System.loadLibrary("wolfssl");
+ System.loadLibrary("wolfssljni");
+ }
+}
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/layout/activity_main.xml b/android/wolfssljni-ndk-gradle/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..744df7ed
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..cde69bcc
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..9a078e3e
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..c133a0cb
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..efc028a6
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..bfa42f0e
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..3af2608a
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..324e72cd
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..9bec2e62
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..aee44e13
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..34947cd6
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/values/colors.xml b/android/wolfssljni-ndk-gradle/app/src/main/res/values/colors.xml
new file mode 100644
index 00000000..3ab3e9cb
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+
+
+ #3F51B5
+ #303F9F
+ #FF4081
+
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/values/strings.xml b/android/wolfssljni-ndk-gradle/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..2bb902f1
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ wolfssl_ndk_gradle
+
diff --git a/android/wolfssljni-ndk-gradle/app/src/main/res/values/styles.xml b/android/wolfssljni-ndk-gradle/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..5885930d
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff --git a/android/wolfssljni-ndk-gradle/build.gradle b/android/wolfssljni-ndk-gradle/build.gradle
new file mode 100644
index 00000000..c2eea8e2
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.3.3'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/android/wolfssljni-ndk-gradle/gradle.properties b/android/wolfssljni-ndk-gradle/gradle.properties
new file mode 100644
index 00000000..aac7c9b4
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/gradle.properties
@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.jar b/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties b/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..fcc16821
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Aug 21 16:07:11 MDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/android/wolfssljni-ndk-gradle/gradlew b/android/wolfssljni-ndk-gradle/gradlew
new file mode 100755
index 00000000..9d82f789
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/android/wolfssljni-ndk-gradle/gradlew.bat b/android/wolfssljni-ndk-gradle/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/wolfssljni-ndk-gradle/settings.gradle b/android/wolfssljni-ndk-gradle/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/android/wolfssljni-ndk-gradle/wolfssl b/android/wolfssljni-ndk-gradle/wolfssl
new file mode 160000
index 00000000..34dc4a49
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/wolfssl
@@ -0,0 +1 @@
+Subproject commit 34dc4a493d64160d6d87a5cfbd7c0ca803fce68a
diff --git a/android/wolfssljni-ndk-gradle/wolfssljni b/android/wolfssljni-ndk-gradle/wolfssljni
new file mode 160000
index 00000000..43acf662
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/wolfssljni
@@ -0,0 +1 @@
+Subproject commit 43acf6629400efc2eb4d39cc6975cfa3f105bacc
diff --git a/android/wolfssljni-ndk-gradle/wolfssljni-ndk-gradle.iml b/android/wolfssljni-ndk-gradle/wolfssljni-ndk-gradle.iml
new file mode 100644
index 00000000..1a236a51
--- /dev/null
+++ b/android/wolfssljni-ndk-gradle/wolfssljni-ndk-gradle.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file