oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

android: use "strip" from the Android NDK

Browse Source
This commit is contained in:
Max Kellermann 2014-03-01 08:52:28 +01:00
parent 5bc5abf0e7
commit b2c523e56d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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 android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml
mkdir -p $(@D) mkdir -p $(@D)
rm -f $@ rm -f $@
strip -o $@ $< $(STRIP) -o $@ $<
android/build/bin/Main-debug.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so android/build/bin/Main-debug.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so
cd android/build && ant nodeps debug cd android/build && ant nodeps debug

5
android/build.py
View File

@ -59,7 +59,7 @@ target_root = os.path.join(ndk_platform_path, 'arch-' + ndk_arch)
llvm_triple = 'armv7-none-linux-androideabi' llvm_triple = 'armv7-none-linux-androideabi'
def select_toolchain(use_cxx, use_clang): 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' target_arch = '-march=armv7-a -mfloat-abi=softfp'
if use_clang: if use_clang:
@ -70,6 +70,7 @@ def select_toolchain(use_cxx, use_clang):
cc = os.path.join(gcc_toolchain, 'bin', host_arch + '-gcc') cc = os.path.join(gcc_toolchain, 'bin', host_arch + '-gcc')
cxx = os.path.join(gcc_toolchain, 'bin', host_arch + '-g++') cxx = os.path.join(gcc_toolchain, 'bin', host_arch + '-g++')
ar = os.path.join(gcc_toolchain, 'bin', host_arch + '-ar') 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_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') 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, 'LDFLAGS=' + ldflags,
'LIBS=' + libs, 'LIBS=' + libs,
'AR=' + ar, 'AR=' + ar,
'STRIP=' + strip,
'--host=' + host_arch, '--host=' + host_arch,
'--prefix=' + root_path, '--prefix=' + root_path,
'--with-sysroot=' + target_root, '--with-sysroot=' + target_root,
@ -311,6 +313,7 @@ configure = [
'LDFLAGS=' + ldflags, 'LDFLAGS=' + ldflags,
'LIBS=' + libs, 'LIBS=' + libs,
'AR=' + ar, 'AR=' + ar,
'STRIP=' + strip,
'--host=' + host_arch, '--host=' + host_arch,
'--prefix=' + root_path, '--prefix=' + root_path,
'--with-sysroot=' + target_root, '--with-sysroot=' + target_root,