From f4571d982017a061266627ff9d2bd154a58e8850 Mon Sep 17 00:00:00 2001
From: alision <alexandre.lision@savoirfairelinux.com>
Date: Thu, 4 Jul 2013 17:11:35 -0400
Subject: [PATCH] * #26799 Modified jenkins script to build apk.
---
README | 3 ++-
jenkins-sflphone-android.sh | 13 ++++++++++---
local.properties | 10 ++++++++++
.../sflphone/fragments/ContactListFragment.java | 2 +-
4 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 local.properties
diff --git a/README b/README
index 1fa98ca69..549cdb7bc 100644
--- a/README
+++ b/README
@@ -25,7 +25,8 @@ Check that following files are executable:
Compile pjsip-android
$ pushd jni/pjproject-android/android
-$ ./configure-android --disable-sound
+$ ./configure-android --disable-sound --disable-oss --disable-video --enable-ext-sound --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l
+
$ make dep && make
$ popd
diff --git a/jenkins-sflphone-android.sh b/jenkins-sflphone-android.sh
index 546cb689b..a7acfde11 100755
--- a/jenkins-sflphone-android.sh
+++ b/jenkins-sflphone-android.sh
@@ -106,17 +106,24 @@ launch_emulator() {
build_sflphone_android() {
# android update project --target $VIRTUAL_DEVICE_ID --path $ANDROID_PROJECT_PATH
+ echo "Compile pjandroid stack"
+ pushd jni/pjproject-android/android
+ ./configure-android --disable-sound --disable-oss --disable-video --enable-ext-sound --disable-speex-aec --disable-g711-codec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-sdl --disable-ffmpeg --disable-v4l
+ make dep && make
+ popd
+
+ ./make-swig.h
echo "Build JNI related libraries"
# ndk-build clean
- ndk-build -j4
+ ndk-build
echo "Build Java application"
ant clean
ant debug
- echo "Upload sflphone on the virtual device"
- adb install -r $ANDROID_SFLPHONE_BIN
+ # echo "Upload sflphone on the virtual device"
+ #adb install -r $ANDROID_SFLPHONE_BIN
# ./adb-push-sflphone.sh
}
diff --git a/local.properties b/local.properties
new file mode 100644
index 000000000..93298d942
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/home/lisional/Dev/ADT/sdk
diff --git a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
index 8c356d000..360d2ca3d 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
@@ -172,7 +172,7 @@ public class ContactListFragment extends Fragment implements OnQueryTextListener
@Override
public void onItemClick(AdapterView<?> arg0, View v, int pos, long arg3) {
- mCallbacks.onContactSelected(mListAdapter.getItem(pos));
+ mCallbacks.onContactSelected(mListAdapter.getItem(pos-1));
// ((SearchView) mHandle.findViewById(R.id.contact_search_text)).setIconified(true);
}
--
GitLab