fix hello-jni and derivatives for JNIEXPORT and JNICALL modifiers

rajanya · Sep 19, 2016 · be388d7 · be388d7
1 parent c6f78d2
commit be388d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/hello-jni/app/src/main/cpp/hello-jni.c b/hello-jni/app/src/main/cpp/hello-jni.c
@@ -21,9 +21,9 @@
  * to return a new VM String. See the corresponding Java source
  * file located at:
  *
- *   apps/samples/hello-jni/project/src/com/example/hellojni/HelloJni.java
+ *   hello-jni/app/src/main/java/com/example/hellojni/HelloJni.java
  */
-jstring
+JNIEXPORT jstring JNICALL
 Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,
                                                   jobject thiz )
 {

diff --git a/hello-jniCallback/app/src/main/cpp/hello-jnicallback.c b/hello-jniCallback/app/src/main/cpp/hello-jnicallback.c
@@ -46,9 +46,9 @@ TickContext g_ctx;
  * to return a new VM String. See the corresponding Java source
  * file located at:
  *
- *   apps/samples/hello-jni/project/src/com/example/hellojni/HelloJni.java
+ *   hello-jniCallback/app/src/main/java/com/example/hellojnicallback/MainActivity.java
  */
-jstring
+JNIEXPORT jstring JNICALL
 Java_com_example_hellojnicallback_MainActivity_stringFromJNI( JNIEnv* env, jobject thiz )
 {
 #if defined(__arm__)

diff --git a/hello-libs/gen-libs/build.gradle b/hello-libs/gen-libs/build.gradle
@@ -14,7 +14,10 @@ android {
             cmake {
                 arguments '-DANDROID_PLATFORM=android-9',
                           '-DANDROID_TOOLCHAIN=clang'
+                // explicitly build libs
+                targets 'gmath', 'gperf'
             }
+
         }
     }
     buildTypes {