From 83d691693ec7f081a97578945179ba343fb6bab8 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Wed, 20 Apr 2016 09:55:02 +0300 Subject: [PATCH] #119 fix build of android native app example --- .../android/android_native_app_glue_impl.d | 6 +-- android/dlangui_source_files.mk | 11 +++++ deps/DerelictGL3 | 2 +- deps/DerelictSDL2 | 2 +- examples/android/AndroidManifest.xml | 2 +- examples/android/android_build_config.mk | 2 + examples/android/build_apk.sh | 48 ++++++++++++------- examples/android/deploy_apk.sh | 3 +- examples/android/watch_logs.sh | 4 +- 9 files changed, 51 insertions(+), 29 deletions(-) diff --git a/3rdparty/android/android_native_app_glue_impl.d b/3rdparty/android/android_native_app_glue_impl.d index 0dc641f5..01d7169b 100644 --- a/3rdparty/android/android_native_app_glue_impl.d +++ b/3rdparty/android/android_native_app_glue_impl.d @@ -248,10 +248,10 @@ void* android_app_entry(void* param) { pthread_mutex_unlock(&android_app.mutex); - //import core.runtime; - //rt_init(); + import core.runtime; + rt_init(); android_main(android_app); - //rt_term(); + rt_term(); android_app_destroy(android_app); return null; diff --git a/android/dlangui_source_files.mk b/android/dlangui_source_files.mk index 2f310d69..5656d43e 100644 --- a/android/dlangui_source_files.mk +++ b/android/dlangui_source_files.mk @@ -145,6 +145,17 @@ DLANGUI_IMPORT_PATHS="\ -J$DLANGUI_DIR/views/res/shaders \ " +DLANGUI_LDLIBS="\ +-lgcc \ +-llog \ +-landroid \ +-lEGL \ +-lGLESv3 \ +-lGLESv1_CM \ +-lc \ +-lm \ +" + #echo "Import paths: $DLANGUI_IMPORT_PATHS" #echo "Source paths: $DLANGUI_SOURCE_PATHS" diff --git a/deps/DerelictGL3 b/deps/DerelictGL3 index b77b9ca9..769c5b64 160000 --- a/deps/DerelictGL3 +++ b/deps/DerelictGL3 @@ -1 +1 @@ -Subproject commit b77b9ca9351511296a59c53edc79092f84da4246 +Subproject commit 769c5b6439d805cdcb29a9d1bcf4423bc513dd8b diff --git a/deps/DerelictSDL2 b/deps/DerelictSDL2 index 174ad753..4f2e6ea4 160000 --- a/deps/DerelictSDL2 +++ b/deps/DerelictSDL2 @@ -1 +1 @@ -Subproject commit 174ad753193330e55cb18c3f9e8745e0eab3d418 +Subproject commit 4f2e6ea479a0e48e2e62fe963922fd141a440adc diff --git a/examples/android/AndroidManifest.xml b/examples/android/AndroidManifest.xml index 54af5691..8caffef2 100644 --- a/examples/android/AndroidManifest.xml +++ b/examples/android/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/examples/android/android_build_config.mk b/examples/android/android_build_config.mk index 602e2fb3..86a1829b 100644 --- a/examples/android/android_build_config.mk +++ b/examples/android/android_build_config.mk @@ -10,3 +10,5 @@ export NDK=$HOME/android-ndk-r11c export SDK=$HOME/android-sdk-linux export LDC=$HOME/ldc2-android-arm-0.17.0-alpha2-linux-x86_64 export NDK_ARCH=x86_64 +#export JAVA_HOME=/usr/local/java/jdk1.7.0_40 +export JAVA_HOME=/usr/lib/jvm/java-8-oracle/ diff --git a/examples/android/build_apk.sh b/examples/android/build_apk.sh index 87581182..243be474 100755 --- a/examples/android/build_apk.sh +++ b/examples/android/build_apk.sh @@ -2,6 +2,8 @@ # load settings for paths . ./android_build_config.mk +echo "" +echo "====================================" echo "DlangUI Build for Android native app" echo "====================================" echo "DLANGUI_DIR: $DLANGUI_DIR" @@ -15,9 +17,21 @@ echo "LDC: $LDC" # application sources . ./android_app.mk +warn () { + echo "$0:" "$@" >&2 +} +die () { + rc=$1 + shift + warn "$@" + exit $rc +} + #PLATFORM_DIR=arm PLATFORM_DIR=armeabi-v7a + + echo "\nLOCAL_MODULE: $LOCAL_MODULE" #echo "DLANGUI SOURCES: $DLANGUI_SOURCES" @@ -33,21 +47,15 @@ OBJFILE="build/$PLATFORM_DIR/lib$LOCAL_MODULE.o" LIBS="\ -L$NDK/platforms/android-19/arch-arm/usr/lib \ -$LDC/lib/libphobos2-ldc.a $LDC/lib/libdruntime-ldc.a \ --lgcc \ --llog \ --landroid \ --lEGL \ --lGLESv3 \ --lGLESv1_CM \ --lc -lm \ +$LDC/lib/libphobos2-ldc.a \ +$LDC/lib/libdruntime-ldc.a \ $LOCAL_LDLIBS \ +$DLANGUI_LDLIBS \ " -#-lGLESv1_CM \ - LINK_OPTIONS="\ -Wl,-soname,libnative-activity.so \ +-shared \ --sysroot=$NDK/platforms/android-19/arch-arm \ -gcc-toolchain $NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-$NDK_ARCH \ -no-canonical-prefixes \ @@ -64,17 +72,21 @@ LINK_OPTIONS="\ mkdir -p libs/$PLATFORM_DIR/ mkdir -p build/$PLATFORM_DIR/ +echo "\nCompiling $OBJFILE...\n" #========================================================= -echo "\nCompiling $OBJFILE\n" -$LDC/bin/ldc2 $LDC_PARAMS $SOURCE_PATHS $SOURCES -c -singleobj -of=$OBJFILE || exit 1 +$LDC/bin/ldc2 $LDC_PARAMS $SOURCE_PATHS $SOURCES -c -singleobj -of=$OBJFILE || die 2 "ldc2 build for $OBJFILE is failed" +echo "\n\nLinking $TARGET...\n" #========================================================= -echo "\n\nLinking $TARGET\n" -$CC $OBJFILE $LIBS $LINK_OPTIONS -o $TARGET || exit 1 - +$CC $OBJFILE $LIBS $LINK_OPTIONS -o $TARGET || die 2 "$TARGET linking is failed" echo "Library is linked ok\n" -echo "Building APK" +echo "Updating ant project..." +#========================================================= +$SDK/tools/android update project -p . -s --target 1 || die 3 "Android Project update is failed" -$SDK/tools/android update project -p . -s --target 1 -ant debug +echo "Building APK..." +#========================================================= +ant debug || die 4 "Android APK creation is failed" + +echo "Successful." diff --git a/examples/android/deploy_apk.sh b/examples/android/deploy_apk.sh index 75c4710c..15c9183e 100755 --- a/examples/android/deploy_apk.sh +++ b/examples/android/deploy_apk.sh @@ -1,5 +1,4 @@ #!/bin/sh -export SDK=$HOME/android-sdk-linux +. ./android_build_config.mk $SDK/platform-tools/adb install -r bin/NativeActivity-debug.apk - diff --git a/examples/android/watch_logs.sh b/examples/android/watch_logs.sh index 7888cad7..7ad96032 100755 --- a/examples/android/watch_logs.sh +++ b/examples/android/watch_logs.sh @@ -1,6 +1,4 @@ #!/bin/sh -export SDK=$HOME/android-sdk-linux +. ./android_build_config.mk $SDK/platform-tools/adb logcat | less -#$SDK/platform-tools/adb logcat | grep "native" -