Merge branch 'master' of git.linphone.org:linphone-android

This commit is contained in:
François Grisez 2014-08-01 15:51:37 +02:00
commit ba5fc7ce51
4 changed files with 370 additions and 368 deletions

4
README
View file

@ -3,7 +3,7 @@
To build liblinphone for Android, you must: To build liblinphone for Android, you must:
0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path. 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path.
1) download the Android ndk (>=r9d) from google and add it to your path (no symlink !!!). 1) download the Android ndk (>=r9d, < r10) from google and add it to your path (no symlink !!!).
2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig 2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig
On 64 bits linux systems you'll need the ia32-libs package On 64 bits linux systems you'll need the ia32-libs package
With the latest Debian (multiarch), you need this: With the latest Debian (multiarch), you need this:
@ -39,6 +39,8 @@ To create an apk with a different package name, you need to edit the custom_rule
TROUBLESHOOTING TROUBLESHOOTING
***************************** *****************************
Currently Android NDK 10 is NOT supported for X86 version, please use Android NDK 9d maximum.
If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU If you encounter troubles with the make clean target and you are using the 8e android ndk, the solution can be found here: https://groups.google.com/forum/?fromgroups=#!topic/android-ndk/3wIbb-h3nDU
If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions: If you built the app using eclipse, ensure you ran at least once the make command (see above steps 0 to 3) ! Else you'll have this exceptions:

View file

@ -31,7 +31,7 @@
android:background="@drawable/history_all" android:background="@drawable/history_all"
android:text="@string/button_all_call" android:text="@string/button_all_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -45,7 +45,7 @@
android:background="@drawable/history_missed" android:background="@drawable/history_missed"
android:text="@string/button_missed_call" android:text="@string/button_missed_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

View file

@ -32,7 +32,7 @@
android:background="@drawable/history_all" android:background="@drawable/history_all"
android:text="@string/button_all_call" android:text="@string/button_all_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -47,7 +47,7 @@
android:background="@drawable/history_missed" android:background="@drawable/history_missed"
android:text="@string/button_missed_call" android:text="@string/button_missed_call"
android:gravity="center" android:gravity="center"
android:paddingTop="15dp" android:paddingTop="20dp"
android:textSize="13dp" android:textSize="13dp"
android:textColor="@drawable/text_switch_button_color" android:textColor="@drawable/text_switch_button_color"
android:layout_width="match_parent" android:layout_width="match_parent"