diff --git a/build.sh b/build.sh index 6b66e10fe..ff331160e 100755 --- a/build.sh +++ b/build.sh @@ -38,4 +38,5 @@ cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j4 && \ ant debug && \ test -z "$1" && cd bin && \ adb install -r MainActivity-debug.apk | grep 'Failure' && \ - adb uninstall `grep AppFullName ../../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r MainActivity-debug.apk + adb uninstall `grep AppFullName ../../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r MainActivity-debug.apk && \ + adb shell am -n `grep AppFullName ../../AndroidAppSettings.cfg | sed 's/.*=//'`/.MainActivity diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index 0b7babc14..b1992aa7a 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -57,19 +57,19 @@ LOCAL_LDLIBS += -L$(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_A endif endif -LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \ - for f in $(LOCAL_PATH)/../../obj/local/armeabi/*.so ; do \ - if echo $$f | grep "libapplication[.]so" > /dev/null ; then \ - continue ; \ - fi ; \ - if [ -e "$$f" ] ; then \ - if nm -g $$f | cut -c 12- | egrep '.{128}' > /dev/null ; then \ - echo $$f | grep -o 'lib[^/]*[.]so' ; \ - fi ; \ - fi ; \ - done \ -) ) - +#LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \ +# for f in $(LOCAL_PATH)/../../obj/local/armeabi/*.so ; do \ +# if echo $$f | grep "libapplication[.]so" > /dev/null ; then \ +# continue ; \ +# fi ; \ +# if [ -e "$$f" ] ; then \ +# if nm -g $$f | cut -c 12- | egrep '.{128}' > /dev/null ; then \ +# echo $$f | grep -o 'lib[^/]*[.]so' ; \ +# fi ; \ +# fi ; \ +# done \ +#) ) +# #ifneq "$(LIBS_WITH_LONG_SYMBOLS)" "" #$(foreach F, $(LIBS_WITH_LONG_SYMBOLS), \ #$(info Library $(F): abusing symbol names are: \ diff --git a/project/jni/application/src b/project/jni/application/src index 104f796a6..92362c4db 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ballfield \ No newline at end of file +ufoai \ No newline at end of file