Updated way of using locally generated aar

This commit is contained in:
Sylvain Berfini 2018-11-15 13:53:23 +01:00
parent 142930d1cc
commit e02348eaf2
8 changed files with 19 additions and 11 deletions

View file

@ -10,8 +10,8 @@ def firebaseEnabled() {
} }
def isLocalAarAvailable() { def isLocalAarAvailable() {
File debugAar = new File('linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-debug.aar') File debugAar = new File('linphone-sdk-android/linphone-sdk-android-debug.aar')
File releaseAar = new File('linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar') File releaseAar = new File('linphone-sdk-android/linphone-sdk-android-release.aar')
return debugAar.exists() || releaseAar.exists() return debugAar.exists() || releaseAar.exists()
} }

View file

@ -92,7 +92,7 @@
<data android:scheme="imto"/> <data android:scheme="imto"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:mimeType="@string/sync_mimetype"/> <!-- Change package in res/values/non_localizable_custom.xml ! --> <data android:mimeType="@string/sync_mimetype"/>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE"/>
@ -283,7 +283,7 @@
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="org.linphone.provider" android:authorities="${applicationId}.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data

View file

@ -5,8 +5,8 @@
<string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses --> <string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses -->
<string name="default_conference_factory_uri">sip:conference-factory@sip.linphone.org</string> <string name="default_conference_factory_uri">sip:conference-factory@sip.linphone.org</string>
<string name="file_provider">org.linphone.provider</string> <string name="file_provider">org.linphone.provider</string>
<string name="sync_account_type">org.linphone</string> <!-- Change package ! --> <string name="sync_account_type">${applicationId}</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! --> <string name="sync_mimetype">vnd.android.cursor.item/${applicationId}.profile</string>
<string name="rls_uri">sip:rls@sip.linphone.org</string> <string name="rls_uri">sip:rls@sip.linphone.org</string>
<string name="user_agent">LinphoneAndroid</string> <string name="user_agent">LinphoneAndroid</string>
<bool name="orientation_portrait_only">false</bool> <bool name="orientation_portrait_only">false</bool>

View file

@ -3,9 +3,8 @@
<ContactsSource <ContactsSource
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Change package, leave vnd.android.cursor.item/ before and .profile at the end. -->
<ContactsDataKind <ContactsDataKind
android:mimeType="vnd.android.cursor.item/org.linphone.profile" android:mimeType="vnd.android.cursor.item/${applicationId}.profile"
android:icon="@drawable/linphone_logo" android:icon="@drawable/linphone_logo"
android:summaryColumn="data2" android:summaryColumn="data2"
android:detailColumn="data3" android:detailColumn="data3"

View file

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Change package ! -->
<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
android:contentAuthority="com.android.contacts" android:contentAuthority="com.android.contacts"
android:accountType="org.linphone" android:accountType="${applicationId}"
android:supportsUploading="false" android:supportsUploading="false"
android:userVisible="false"/> android:userVisible="false"/>

View file

@ -1,2 +1,11 @@
configurations.maybeCreate("default") configurations.maybeCreate("default")
File debugAar = new File('linphone-sdk-android/linphone-sdk-android-debug.aar')
File releaseAar = new File('linphone-sdk-android/linphone-sdk-android-release.aar')
if (debugAar.exists()) {
artifacts.add("default", file('linphone-sdk-android-debug.aar')) artifacts.add("default", file('linphone-sdk-android-debug.aar'))
}
if (releaseAar.exists()) {
artifacts.add("default", file('linphone-sdk-android-release.aar'))
}

View file

@ -0,0 +1 @@
../linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-debug.aar

View file

@ -0,0 +1 @@
../linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar