diff options
| author | wsnipex <wsnipex@a1.net> | 2016-10-11 20:38:41 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2016-10-13 14:16:22 +0200 |
| commit | ae06a53de5bd2f0596f46e177d089773983b068a (patch) | |
| tree | 826ff9456ae2b5f41cbf09579725be68233555ae | |
| parent | 807f71865b897081f4c89653b2e674f9f245421d (diff) | |
[android] don't strip binaries in debug builds
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tools/android/packaging/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 6a8b4a26a5..1bf98a46c9 100644 --- a/configure.ac +++ b/configure.ac @@ -719,6 +719,7 @@ fi # platform debug flags if test "$use_debug" = "yes"; then + CMAKE_BUILD_TYPE="Debug" final_message="$final_message\n Debugging:\tYes" if test "$use_profiling" = "yes"; then final_message="$final_message\n Profiling:\tYes" @@ -728,6 +729,7 @@ if test "$use_debug" = "yes"; then DEBUG_FLAGS="-g -D_DEBUG -Wall" fi else + CMAKE_BUILD_TYPE="Release" final_message="$final_message\n Debugging:\tNo" if test "$use_profiling" = "yes"; then final_message="$final_message\n Profiling:\tYes" @@ -2268,6 +2270,8 @@ OUTPUT_FILES="$OUTPUT_FILES \ .dummy" AC_SUBST(CORE_SYSTEM_NAME) AC_SUBST(CORE_SYSTEM_VARIANT) +AC_SUBST(CROSS_COMPILING) +AC_SUBST(CMAKE_BUILD_TYPE) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(INCLUDES) @@ -2321,7 +2325,6 @@ AC_SUBST(HAVE_SSE4) AC_SUBST(USE_MMAL) AC_SUBST(USE_X11) AC_SUBST(USE_OPTICAL_DRIVE) -AC_SUBST(CROSS_COMPILING) # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 992c9f36e1..89d81a5c6f 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -135,7 +135,9 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so find $(PREFIX)/lib/@APP_NAME_LC@/system -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; cd xbmc/obj/local/$(CPU)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@ cp -fp xbmc/obj/local/$(CPU)/*.so xbmc/lib/$(CPU)/ +ifeq (@CMAKE_BUILD_TYPE@,Release) $(STRIP) --strip-unneeded xbmc/lib/$(CPU)/*.so +endif install -p $(GDBPATH) ./xbmc/libs/$(CPU)/gdbserver echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/libs/$(CPU)/gdb.setup echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \ |