Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved Makafile to auto update linphonecore version

Browse source
This commit is contained in:
Sylvain Berfini 2012-08-02 12:55:57 +02:00
parent c2fb98aade
commit 798126fdcb
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -3,6 +3,7 @@ SDK_PATH=$(shell dirname `which android`)
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" ) NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
LINPHONE_VERSION=$(shell cat submodules/linphone/configure.ac | grep -m 1 "LINPHONE_VERSION=" | sed -e 's/LINPHONE_VERSION=//')
KEYSTORE=bc-android.keystore KEYSTORE=bc-android.keystore
KEYALIAS=nw8000 KEYALIAS=nw8000
@ -48,7 +49,7 @@ prepare-mediastreamer2:
prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
generate-libs: generate-libs:
$(NDK_PATH)/ndk-build BUILD_SILK=1 BUILD_AMRNB=full -j$(NUMCPUS) $(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_SILK=1 BUILD_AMRNB=full -j$(NUMCPUS)
update-project: update-project:
$(SDK_PATH)/android update project --path . $(SDK_PATH)/android update project --path .

2
src/org/linphone/setup/GenericLoginFragment.java
View file

@ -23,8 +23,8 @@ import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Toast; import android.widget.Toast;

2
submodules/linphone

@ -1 +1 @@
Subproject commit 271814cdfb76fa4fa1407d4b6ab9aa924b792d09 Subproject commit 5f2640d57a48e122cb14ffa2df23304103e3d6a9