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

* commit '7582b31a67210cb6c79556b0f41364be715280d4':
  Enhance hello-jni to report APP_ABI at compilation
This commit is contained in:
Andrew Hsieh
2014-01-09 21:36:39 +00:00
committed by Android Git Automerger
2 changed files with 20 additions and 1 deletions

View File

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

View File

@@ -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 ".");
}