Fix samples for 64-bit ABIs

1. Set APP_ABI:=all in almost all samples
2. Enhance hello-jni to report more ABIs
3. Fix warnings

Change-Id: I2851c42b77ef8225e32143d225edcf973633e782

15 files changed, 30 insertions, 10 deletions

diff --git a/ndk/platforms/android-14/samples/native-media/jni/Application.mk b/ndk/platforms/android-14/samples/native-media/jni/Application.mk
new file mode 100644
index 000000000..e619d92fc
--- /dev/null
+++ b/ndk/platforms/android-14/samples/native-media/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
\ No newline at end of file
diff --git a/ndk/platforms/android-14/samples/native-media/jni/native-media-jni.c b/ndk/platforms/android-14/samples/native-media/jni/native-media-jni.c
index bdf568a4f..ad6d8740b 100644
--- a/ndk/platforms/android-14/samples/native-media/jni/native-media-jni.c
+++ b/ndk/platforms/android-14/samples/native-media/jni/native-media-jni.c
@@ -288,7 +288,7 @@ static jboolean enqueueInitialBuffers(jboolean discontinuity)
         LOGV("Dropping last packet because it is not whole");
     }
     size_t packetsRead = bytesRead / MPEG2_TS_PACKET_SIZE;
-    LOGV("Initially queueing %u packets", packetsRead);
+    LOGV("Initially queueing %zu packets", packetsRead);
 
     /* Enqueue the content of our cache before starting to play,
        we don't want to starve the player */
diff --git a/ndk/platforms/android-18/samples/gles3jni/jni/Application.mk b/ndk/platforms/android-18/samples/gles3jni/jni/Application.mk
new file mode 100644
index 000000000..a252a72d7
--- /dev/null
+++ b/ndk/platforms/android-18/samples/gles3jni/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
diff --git a/ndk/platforms/android-4/samples/san-angeles/jni/Application.mk b/ndk/platforms/android-4/samples/san-angeles/jni/Application.mk
new file mode 100644
index 000000000..e619d92fc
--- /dev/null
+++ b/ndk/platforms/android-4/samples/san-angeles/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
\ No newline at end of file
diff --git a/ndk/platforms/android-5/samples/hello-gl2/jni/Application.mk b/ndk/platforms/android-5/samples/hello-gl2/jni/Application.mk
new file mode 100644
index 000000000..a252a72d7
--- /dev/null
+++ b/ndk/platforms/android-5/samples/hello-gl2/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
diff --git a/ndk/platforms/android-8/samples/bitmap-plasma/jni/Application.mk b/ndk/platforms/android-8/samples/bitmap-plasma/jni/Application.mk
index 8c8530737..9c50d4695 100644
--- a/ndk/platforms/android-8/samples/bitmap-plasma/jni/Application.mk
+++ b/ndk/platforms/android-8/samples/bitmap-plasma/jni/Application.mk
@@ -1,3 +1,2 @@
-# The ARMv7 is significanly faster due to the use of the hardware FPU
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := all
 APP_PLATFORM := android-8
diff --git a/ndk/platforms/android-8/samples/bitmap-plasma/jni/plasma.c b/ndk/platforms/android-8/samples/bitmap-plasma/jni/plasma.c
index d5f98fbbb..88f35e60e 100644
--- a/ndk/platforms/android-8/samples/bitmap-plasma/jni/plasma.c
+++ b/ndk/platforms/android-8/samples/bitmap-plasma/jni/plasma.c
@@ -215,7 +215,7 @@ static void fill_plasma( AndroidBitmapInfo*  info, void*  pixels, double  t )
         uint16_t*  line_end = line + info->width;
 
         if (line < line_end) {
-            if (((uint32_t)line & 3) != 0) {
+            if (((uint32_t)(uintptr_t)line & 3) != 0) {
                 Fixed ii = base + fixed_sin(xt1) + fixed_sin(xt2);
 
                 xt1 += XT1_INCR;
diff --git a/ndk/platforms/android-9/samples/native-activity/jni/Application.mk b/ndk/platforms/android-9/samples/native-activity/jni/Application.mk
index 682f11b2f..a304c8f2e 100644
--- a/ndk/platforms/android-9/samples/native-activity/jni/Application.mk
+++ b/ndk/platforms/android-9/samples/native-activity/jni/Application.mk
@@ -1 +1,2 @@
+APP_ABI := all
 APP_PLATFORM := android-10
diff --git a/ndk/platforms/android-9/samples/native-audio/jni/Application.mk b/ndk/platforms/android-9/samples/native-audio/jni/Application.mk
new file mode 100644
index 000000000..e619d92fc
--- /dev/null
+++ b/ndk/platforms/android-9/samples/native-audio/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
\ No newline at end of file
diff --git a/ndk/platforms/android-9/samples/native-plasma/jni/Application.mk b/ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
index 70bbb6266..a304c8f2e 100644
--- a/ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
+++ b/ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
@@ -1,3 +1,2 @@
-# The ARMv7 is significanly faster due to the use of the hardware FPU
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := all
 APP_PLATFORM := android-10
diff --git a/ndk/platforms/android-9/samples/native-plasma/jni/plasma.c b/ndk/platforms/android-9/samples/native-plasma/jni/plasma.c
index 617503378..50e136d9d 100644
--- a/ndk/platforms/android-9/samples/native-plasma/jni/plasma.c
+++ b/ndk/platforms/android-9/samples/native-plasma/jni/plasma.c
@@ -224,7 +224,7 @@ static void fill_plasma(ANativeWindow_Buffer* buffer, double  t)
         uint16_t*  line_end = line + buffer->width;
 
         if (line < line_end) {
-            if (((uint32_t)line & 3) != 0) {
+            if (((uint32_t)(uintptr_t)line & 3) != 0) {
                 Fixed ii = base + fixed_sin(xt1) + fixed_sin(xt2);
 
                 xt1 += XT1_INCR;
diff --git a/ndk/samples/hello-jni/jni/hello-jni.c b/ndk/samples/hello-jni/jni/hello-jni.c
index 19fcc6a86..80e980483 100644
--- a/ndk/samples/hello-jni/jni/hello-jni.c
+++ b/ndk/samples/hello-jni/jni/hello-jni.c
@@ -30,17 +30,31 @@ Java_com_example_hellojni_HelloJni_stringFromJNI( JNIEnv* env,
 #if defined(__arm__)
   #if defined(__ARM_ARCH_7A__)
     #if defined(__ARM_NEON__)
-      #define ABI "armeabi-v7a/NEON"
+      #if defined(__ARM_PCS_VFP)
+        #define ABI "armeabi-v7a/NEON (hard-float)"
+      #else
+        #define ABI "armeabi-v7a/NEON"
+      #endif
     #else
-      #define ABI "armeabi-v7a"
+      #if defined(__ARM_PCS_VFP)
+        #define ABI "armeabi-v7a (hard-float)"
+      #else
+        #define ABI "armeabi-v7a"
+      #endif
     #endif
   #else
    #define ABI "armeabi"
   #endif
 #elif defined(__i386__)
    #define ABI "x86"
+#elif defined(__x86_64__)
+   #define ABI "x86_64"
+#elif defined(__mips64)  /* mips64el-* toolchain defines __mips__ too */
+   #define ABI "mips64"
 #elif defined(__mips__)
    #define ABI "mips"
+#elif defined(__aarch64__)
+   #define ABI "arm64-v8a"
 #else
    #define ABI "unknown"
 #endif
diff --git a/ndk/samples/hello-neon/jni/Application.mk b/ndk/samples/hello-neon/jni/Application.mk
index db8f86699..6e8154b91 100644
--- a/ndk/samples/hello-neon/jni/Application.mk
+++ b/ndk/samples/hello-neon/jni/Application.mk
@@ -1,2 +1,2 @@
 # Build both ARMv5TE and ARMv7-A machine code.
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := armeabi armeabi-v7a arm64-v8a
diff --git a/ndk/samples/test-libstdc++/jni/Application.mk b/ndk/samples/test-libstdc++/jni/Application.mk
new file mode 100644
index 000000000..e619d92fc
--- /dev/null
+++ b/ndk/samples/test-libstdc++/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
\ No newline at end of file
diff --git a/ndk/samples/two-libs/jni/Application.mk b/ndk/samples/two-libs/jni/Application.mk
new file mode 100644
index 000000000..e619d92fc
--- /dev/null
+++ b/ndk/samples/two-libs/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := all
\ No newline at end of file