am eb9388bc: am d9c17aa7: Merge "Enhance hello-jni to report APP_ABI at compilation"

* commit 'eb9388bcee5372b3c935f92d59bc396500a5e6a7':
  Enhance hello-jni to report APP_ABI at compilation

ndk/samples/hello-jni/jni/Application.mk

@@ -0,0 +1 @@
+APP_ABI := all

ndk/samples/hello-jni/jni/hello-jni.c

@@ -27,5 +27,23 @@ jstring
 Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,
                                                   jobject thiz )
 {
-    return (*env)->NewStringUTF(env, "Hello from JNI !");
+#if defined(__arm__)
+  #if defined(__ARM_ARCH_7A__)
+    #if defined(__ARM_NEON__)
+      #define ABI "armeabi-v7a/NEON"
+    #else
+      #define ABI "armeabi-v7a"
+    #endif
+  #else
+   #define ABI "armeabi"
+  #endif
+#elif defined(__i386__)
+   #define ABI "x86"
+#elif defined(__mips__)
+   #define ABI "mips"
+#else
+   #define ABI "unknown"
+#endif
+
+    return (*env)->NewStringUTF(env, "Hello from JNI !  Compiled with ABI " ABI ".");
 }