diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | android/build.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 84cd2c6ce..2a9482c64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -271,7 +271,7 @@ libmpd_a_DEPENDENCIES += android/build/include/org_musicpd_Bridge.h android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml mkdir -p $(@D) rm -f $@ - strip -o $@ $< + $(STRIP) -o $@ $< android/build/bin/Main-debug.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so cd android/build && ant nodeps debug diff --git a/android/build.py b/android/build.py index 3dbbc4bda..a0a464630 100755 --- a/android/build.py +++ b/android/build.py @@ -59,7 +59,7 @@ target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch) llvm_triple = 'armv7-none-linux-androideabi' def select_toolchain(use_cxx, use_clang): - global cc, cxx, ar, cflags, cxxflags, cppflags, ldflags, libs + global cc, cxx, ar, strip, cflags, cxxflags, cppflags, ldflags, libs target_arch = '-march=armv7-a -mfloat-abi=softfp' if use_clang: @@ -70,6 +70,7 @@ def select_toolchain(use_cxx, use_clang): cc = os.path.join(gcc_toolchain, 'bin', host_arch + '-gcc') cxx = os.path.join(gcc_toolchain, 'bin', host_arch + '-g++') ar = os.path.join(gcc_toolchain, 'bin', host_arch + '-ar') + strip = os.path.join(gcc_toolchain, 'bin', host_arch + '-strip') libstdcxx_path = os.path.join(ndk_path, 'sources/cxx-stl/gnu-libstdc++', gcc_version) libstdcxx_cppflags = '-isystem ' + os.path.join(libstdcxx_path, 'include') + ' -isystem ' + os.path.join(libstdcxx_path, 'libs', android_abi, 'include') @@ -217,6 +218,7 @@ class AutotoolsProject(Project): 'LDFLAGS=' + ldflags, 'LIBS=' + libs, 'AR=' + ar, + 'STRIP=' + strip, '--host=' + host_arch, '--prefix=' + root_path, '--with-sysroot=' + target_root, @@ -311,6 +313,7 @@ configure = [ 'LDFLAGS=' + ldflags, 'LIBS=' + libs, 'AR=' + ar, + 'STRIP=' + strip, '--host=' + host_arch, '--prefix=' + root_path, '--with-sysroot=' + target_root, |