Copy libraries in 2 directories (libs and libs-debug) + Strip the libraries in the libs directory.

Both directories are included in the SDK generation so that the libraries with debug symbols can be used for development and the ones without debug symbols for releases.
This commit is contained in:
Ghislain MARY 2016-05-19 15:06:30 +02:00
parent 8ea79aa9be
commit 795f7ea04d
3 changed files with 43 additions and 17 deletions

1
.gitignore vendored
View file

@ -17,6 +17,7 @@ liblinphone-junit-report.xml
liblinphone-sdk liblinphone-sdk
liblinphonetester_*.zip liblinphonetester_*.zip
libs libs
libs-debug
linphone-android.iml linphone-android.iml
linphone-junit-report*.xml linphone-junit-report*.xml
linphonetester_*.zip linphonetester_*.zip

View file

@ -127,24 +127,28 @@
<zip destfile="liblinphone-android-sdk-${version.name}.zip"> <zip destfile="liblinphone-android-sdk-${version.name}.zip">
<zipfileset dir="libs" prefix="libs" includes="**/*.so" /> <zipfileset dir="libs" prefix="libs" includes="**/*.so" />
<zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs"/> <zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs"/>
<zipfileset dir="libs-debug" prefix="libs-debug" includes="**/*.so" />
<zipfileset dir="${out.absolute.dir}" includes="liblinphone.jar" prefix="libs-debug"/>
</zip> </zip>
</target> </target>
<target name="linphone-android-sdk"> <target name="linphone-android-sdk">
<echo level="info">Creating library output jar file...</echo> <echo level="info">Creating library output jar file...</echo>
<property name="out.library.jar.file" location="${out.absolute.dir}/linphone.jar" /> <property name="out.library.jar.file" location="${out.absolute.dir}/linphone.jar" />
<jar destfile="${out.library.jar.file}"> <jar destfile="${out.library.jar.file}">
<fileset dir="${out.classes.absolute.dir}" <fileset dir="${out.classes.absolute.dir}"
includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/**/*.class de/timroes/axmlrpc/**/*.class de/timroes/base64/Base64.class"/> includes="org/linphone/mediastream/**/*.class org/linphone/core/**/*.class org/linphone/**/*.class de/timroes/axmlrpc/**/*.class de/timroes/base64/Base64.class"/>
<fileset dir="submodules/linphone/java" > <fileset dir="submodules/linphone/java" >
<include name="common/org/linphone/core/*.java"/> <include name="common/org/linphone/core/*.java"/>
<include name="j2se/org/linphone/core/*.java"/> <include name="j2se/org/linphone/core/*.java"/>
</fileset> </fileset>
</jar> </jar>
<zip destfile="linphone-android-sdk-${version.name}.zip"> <zip destfile="linphone-android-sdk-${version.name}.zip">
<zipfileset dir="libs" prefix="libs" includes="**/*.so" /> <zipfileset dir="libs" prefix="libs" includes="**/*.so" />
<zipfileset dir="${out.absolute.dir}" includes="linphone.jar" prefix="libs"/> <zipfileset dir="${out.absolute.dir}" includes="linphone.jar" prefix="libs"/>
</zip> <zipfileset dir="libs-debug" prefix="libs-debug" includes="**/*.so" />
</target> <zipfileset dir="${out.absolute.dir}" includes="linphone.jar" prefix="libs-debug"/>
</zip>
</target>
</project> </project>

View file

@ -187,33 +187,54 @@ $(TOPDIR)/res/raw/rootca.pem:
\tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@ \tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@
copy-libs: copy-libs:
\trm -rf libs-debug/armeabi
\trm -rf libs/armeabi \trm -rf libs/armeabi
\tif test -d "liblinphone-sdk/android-arm"; then \\ \tif test -d "liblinphone-sdk/android-arm"; then \\
\t\tmkdir -p libs-debug/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs-debug/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\
\t\tmkdir -p libs/armeabi && \\ \t\tmkdir -p libs/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi; \\ \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \\
\t\tsh WORK/android-arm/strip.sh libs/armeabi/*.so; \\
\tfi \tfi
\tif test -f "liblinphone-sdk/android-arm/bin/gdbserver"; then \\ \tif test -f "liblinphone-sdk/android-arm/bin/gdbserver"; then \\
\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs-debug/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs-debug/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\ \t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\
\tfi \tfi
\trm -rf libs-debug/armeabi-v7a
\trm -rf libs/armeabi-v7a \trm -rf libs/armeabi-v7a
\tif test -d "liblinphone-sdk/android-armv7"; then \\ \tif test -d "liblinphone-sdk/android-armv7"; then \\
\t\tmkdir -p libs-debug/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs-debug/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\
\t\tmkdir -p libs/armeabi-v7a && \\ \t\tmkdir -p libs/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a; \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \\
\t\tsh WORK/android-armv7/strip.sh libs/armeabi-v7a/*.so; \\
\tfi \tfi
\tif test -f "liblinphone-sdk/android-armv7/bin/gdbserver"; then \\ \tif test -f "liblinphone-sdk/android-armv7/bin/gdbserver"; then \\
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs-debug/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs-debug/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\
\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\ \t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
\tfi \tfi
\trm -rf libs-debug/x86
\trm -rf libs/x86 \trm -rf libs/x86
\tif test -d "liblinphone-sdk/android-x86"; then \\ \tif test -d "liblinphone-sdk/android-x86"; then \\
\t\tmkdir -p libs-debug/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs-debug/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\
\t\tmkdir -p libs/x86 && \\ \t\tmkdir -p libs/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86; \\ \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \\
\t\tsh WORK/android-x86/strip.sh libs/x86/*.so; \\
\tfi \tfi
\tif test -f "liblinphone-sdk/android-x86/bin/gdbserver"; then \\ \tif test -f "liblinphone-sdk/android-x86/bin/gdbserver"; then \\
\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs-debug/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs-debug/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\ \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
\tfi \tfi