Skip to content

Commit fea7f2c

Browse files
committed
Fix bug that prevents app to start on Android 4.2 and 4.3
1 parent fb7c406 commit fea7f2c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

android/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ build: cython project/jni/freeciv-client project/jni/freeciv-server
4646
(cd .. && make data freeciv-src/Makefile pythonforandroid android/project/jni/SDL android/project/jni/SDL2_image android/project/jni/SDL2_ttf android/project/jni/SDL2_mixer android/project/jni/python android/project/jni/curl)
4747
(cd ../freeciv-src && make py_integration/callauto.c)
4848
mkdir -p project/src/main/java/org/libsdl/app
49-
sed 's/protected static SDLActivity mSingleton/public static SDLActivity mSingleton/g' project/jni/SDL/android-project/src/org/libsdl/app/SDLActivity.java >project/src/main/java/org/libsdl/app/SDLActivity.java
49+
cat project/jni/SDL/android-project/src/org/libsdl/app/SDLActivity.java | sed 's/protected static SDLActivity mSingleton/public static SDLActivity mSingleton/g' \
50+
| sed 's/.. "SDL2_image"/"SDL2_image"/g' | sed 's/.. "SDL2_mixer"/"SDL2_mixer"/g' | sed 's/.. "SDL2_ttf"/"SDL2_ttf", "python2.7", "freeciv-client"/g' \
51+
>project/src/main/java/org/libsdl/app/SDLActivity.java
5052
"${ANDROID_NDK_HOME}/ndk-build" -C project -j4 freeciv-server
5153
`ls -1 ${ANDROID_NDK_HOME}/toolchains/arm-linux-androideabi*/prebuilt/*/bin/*strip|head -n 1` --strip-unneeded project/obj/local/armeabi/freeciv-server
5254
`ls -1 ${ANDROID_NDK_HOME}/toolchains/arm-linux-androideabi*/prebuilt/*/bin/*strip|head -n 1` --strip-unneeded project/obj/local/armeabi-v7a/freeciv-server

0 commit comments

Comments
 (0)