Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-10 23:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Compile against android-10 while we still care about Gingerbread ... nom nom nom

Browse Source
This commit is contained in:
Aaron Culliney 2015-09-27 15:04:10 -07:00
parent 286012c991
commit 7f32e14a6e
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Android/jni/Application.mk
View File

@ -1,3 +1,8 @@
APP_ABI := armeabi armeabi-v7a ## TODO : x86 APP_ABI := armeabi armeabi-v7a ## TODO : x86
APP_PLATFORM := android-21
# Do not change APP_PLATFORM if we care about Gingerbread (2.3.3) devices! We must compile against android-10,
# otherwise we may encounter runtime load-library errors from symbols that should have been inlined against older
# Bionic. e.g., getpagesize()
APP_PLATFORM := android-10
APP_STL := gnustl_static APP_STL := gnustl_static

2
Android/jni/apple2ix.mk
View File

@ -23,7 +23,7 @@ LOCAL_CPP_EXTENSION := .C
LOCAL_CPPFLAGS := -std=gnu++11 LOCAL_CPPFLAGS := -std=gnu++11
LOCAL_MODULE := libapple2ix LOCAL_MODULE := libapple2ix
LOCAL_SRC_FILES := $(APPLE2_SRC_PATH)/breakpad.C jnicrash.c LOCAL_SRC_FILES := jnicrash.c $(APPLE2_SRC_PATH)/breakpad.C
#LOCAL_ARM_MODE := arm #LOCAL_ARM_MODE := arm
LOCAL_CFLAGS := $(APPLE2_BASE_CFLAGS) $(BREAKPAD_CFLAGS) LOCAL_CFLAGS := $(APPLE2_BASE_CFLAGS) $(BREAKPAD_CFLAGS)
LOCAL_LDLIBS := $(APPLE2_BASE_LDLIBS) LOCAL_LDLIBS := $(APPLE2_BASE_LDLIBS)

2
Android/jni/jnihooks.c
View File

@ -102,6 +102,8 @@ void Java_org_deadc0de_apple2ix_Apple2Activity_nativeOnCreate(JNIEnv *env, jobje
return; return;
} }
// Do not remove this deadc0de ... it forces a runtime load-library/link error on Gingerbread devices if we have
// incorrectly compiled the app against a later version of the NDK!!!
int pagesize = getpagesize(); int pagesize = getpagesize();
LOG("PAGESIZE IS : %d", pagesize); LOG("PAGESIZE IS : %d", pagesize);

7
Android/project.properties
View File

@ -14,6 +14,7 @@
#android.library.reference.1=${sdk.dir}/extras/android/support/v7/appcompat #android.library.reference.1=${sdk.dir}/extras/android/support/v7/appcompat
android.library.reference.1=../../../../Android/Sdk/extras/android/support/v7/appcompat android.library.reference.1=../../../../Android/Sdk/extras/android/support/v7/appcompat
# Project target. # Do not change target if we care about Gingerbread (2.3.3) devices! We must compile against android-10, otherwise we
##target=android-10 # may encounter runtime load-library errors from symbols that should have been inlined against older Bionic. e.g.,
target=android-21 # getpagesize()
target=android-10