Update android example gradle and target sdk version.
The build tools is update android sdk to 31, consistent with it.
Bug: None
Change-Id: I873d13481d24009d7b730b7adeeffd2362145ccd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263800
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37050}
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 34190a4..031d5ac 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -96,7 +96,7 @@
apk_name = "AppRTCMobile"
android_manifest = "androidapp/AndroidManifest.xml"
min_sdk_version = 21
- target_sdk_version = 29
+ target_sdk_version = 31
deps = [
":AppRTCMobile_javalib",
@@ -206,7 +206,7 @@
apk_name = "AppRTCMobileTest"
android_manifest = "androidtests/AndroidManifest.xml"
min_sdk_version = 21
- target_sdk_version = 21
+ target_sdk_version = 31
sources = [
"androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java",
diff --git a/examples/aarproject/app/build.gradle b/examples/aarproject/app/build.gradle
index d47dedb..94fa851 100644
--- a/examples/aarproject/app/build.gradle
+++ b/examples/aarproject/app/build.gradle
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 27
+ compileSdkVersion 31
defaultConfig {
applicationId "org.appspot.apprtc"
minSdkVersion 21
- targetSdkVersion 21
+ targetSdkVersion 31
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/examples/aarproject/build.gradle b/examples/aarproject/build.gradle
index 6780c43..969effd 100644
--- a/examples/aarproject/build.gradle
+++ b/examples/aarproject/build.gradle
@@ -4,10 +4,10 @@
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath "com.android.tools.build:gradle:7.0.3"
// NOTE: Do not place your application dependencies here; they belong
@@ -18,7 +18,7 @@
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
}
}
diff --git a/examples/androidapp/AndroidManifest.xml b/examples/androidapp/AndroidManifest.xml
index c4e1e79..05f1bd3 100644
--- a/examples/androidapp/AndroidManifest.xml
+++ b/examples/androidapp/AndroidManifest.xml
@@ -8,7 +8,6 @@
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -30,7 +29,8 @@
<activity android:name="ConnectActivity"
android:label="@string/app_name"
android:windowSoftInputMode="adjustPan"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/examples/androidnativeapi/AndroidManifest.xml b/examples/androidnativeapi/AndroidManifest.xml
index 9257c41..27c7d9d 100644
--- a/examples/androidnativeapi/AndroidManifest.xml
+++ b/examples/androidnativeapi/AndroidManifest.xml
@@ -2,7 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.webrtc.examples.androidnativeapi">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.CAMERA" />
@@ -11,7 +10,8 @@
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
- <activity android:name=".MainActivity">
+ <activity android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 8606f00..680a16d 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -6,7 +6,7 @@
apk_name = "androidnativeapi"
android_manifest = "AndroidManifest.xml"
min_sdk_version = 21
- target_sdk_version = 27
+ target_sdk_version = 31
sources = [
"java/org/webrtc/examples/androidnativeapi/CallClient.java",
diff --git a/examples/androidtests/AndroidManifest.xml b/examples/androidtests/AndroidManifest.xml
index 8e99536..38ed3e3 100644
--- a/examples/androidtests/AndroidManifest.xml
+++ b/examples/androidtests/AndroidManifest.xml
@@ -14,7 +14,6 @@
package="org.appspot.apprtc.test">
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
<application>
<uses-library android:name="android.test.runner" />
diff --git a/examples/androidvoip/AndroidManifest.xml b/examples/androidvoip/AndroidManifest.xml
index 106f711..8e096b0 100644
--- a/examples/androidvoip/AndroidManifest.xml
+++ b/examples/androidvoip/AndroidManifest.xml
@@ -13,7 +13,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.webrtc.examples.androidvoip">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
@@ -27,7 +26,8 @@
android:label="@string/app_name"
android:supportsRtl="true">
<activity android:name=".MainActivity"
- android:windowSoftInputMode="stateHidden">
+ android:windowSoftInputMode="stateHidden"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/androidvoip/BUILD.gn b/examples/androidvoip/BUILD.gn
index 95b9191..3120e06 100644
--- a/examples/androidvoip/BUILD.gn
+++ b/examples/androidvoip/BUILD.gn
@@ -14,7 +14,7 @@
apk_name = "androidvoip"
android_manifest = "AndroidManifest.xml"
min_sdk_version = 21
- target_sdk_version = 27
+ target_sdk_version = 31
sources = [
"java/org/webrtc/examples/androidvoip/MainActivity.java",