LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix samples for 64-bit ABIs

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

Change-Id: I2851c42b77ef8225e32143d225edcf973633e782
This commit is contained in:
Andrew Hsieh
2014-06-20 16:39:46 -07:00
parent e75afa6aee
commit 458300640f
15 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ndk/platforms/android-14/samples/native-media/jni/Application.mk Normal file
View File

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

2
ndk/platforms/android-14/samples/native-media/jni/native-media-jni.c
View File

@@ -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 */

1
ndk/platforms/android-18/samples/gles3jni/jni/Application.mk Normal file
View File

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

1
ndk/platforms/android-4/samples/san-angeles/jni/Application.mk Normal file
View File

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

1
ndk/platforms/android-5/samples/hello-gl2/jni/Application.mk Normal file
View File

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

3
ndk/platforms/android-8/samples/bitmap-plasma/jni/Application.mk
View File

@@ -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

2
ndk/platforms/android-8/samples/bitmap-plasma/jni/plasma.c
View File

@@ -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;

1
ndk/platforms/android-9/samples/native-activity/jni/Application.mk
View File

@@ -1 +1,2 @@
APP_ABI := all
APP_PLATFORM := android-10

1
ndk/platforms/android-9/samples/native-audio/jni/Application.mk Normal file
View File

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

3
ndk/platforms/android-9/samples/native-plasma/jni/Application.mk
View File

@@ -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

2
ndk/platforms/android-9/samples/native-plasma/jni/plasma.c
View File

@@ -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;