Targetting Android 6 in Manifest, disabled AMRWB for now because of text relocation issue, and ISAC because not done yet since webrtc update [--force]
This commit is contained in:
parent
a6ff219e93
commit
b171bdf04d
2 changed files with 3 additions and 6 deletions
|
@ -2,7 +2,7 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.linphone"
|
||||
android:versionCode="2510" android:installLocation="auto">
|
||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="22"/>
|
||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="23"/>
|
||||
|
||||
<!-- Permissions for Push Notification -->
|
||||
<permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! -->
|
||||
|
|
7
Makefile
7
Makefile
|
@ -43,14 +43,14 @@ BUILD_NON_FREE_CODECS=1
|
|||
ENABLE_OPENH264_DECODER=1
|
||||
BUILD_UPNP=1
|
||||
BUILD_AMRNB=full # 0, light or full
|
||||
BUILD_AMRWB=1
|
||||
BUILD_AMRWB=0 # Has text relocation issue, don't use when targetting API 23 for now
|
||||
BUILD_ZRTP=1
|
||||
BUILD_SILK=1
|
||||
BUILD_TUNNEL=0
|
||||
BUILD_WEBRTC_AECM=1
|
||||
BUILD_OPUS=1
|
||||
BUILD_MATROSKA=1
|
||||
BUILD_WEBRTC_ISAC=1
|
||||
BUILD_WEBRTC_ISAC=0
|
||||
BUILD_FOR_X86=1
|
||||
BUILD_FOR_ARM=1
|
||||
USE_JAVAH=1
|
||||
|
@ -366,9 +366,6 @@ clean-vpx:
|
|||
rm -rf submodules/externals/build/libvpx/arm && \
|
||||
rm -rf submodules/externals/build/libvpx/x86
|
||||
|
||||
|
||||
|
||||
|
||||
#srtp
|
||||
$(TOPDIR)/submodules/externals/srtp/config.h : $(TOPDIR)/submodules/externals/build/srtp/config.h
|
||||
@cd $(TOPDIR)/submodules/externals/srtp/ && \
|
||||
|
|
Loading…
Reference in a new issue