zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace the android support annotation library with androidx's one.

Browse Source 
This change does not affect downstream dependencies as androidx.annotation
is fully compatible with android.support.annotation.

Bug: webrtc:11962
Change-Id: I714b473df8d0fee8000ddf3a9beca7c5613db5ff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226881
Commit-Queue: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34839}
This commit is contained in:
Byoungchan Lee
2021-08-14 11:41:59 +09:00
committed by WebRTC LUCI CQ
parent e9716de2cd
commit 02334e07c5
92 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/BUILD.gn
View File

@ -150,7 +150,7 @@ if (is_android) {
"../sdk/android:video_api_java",
"../sdk/android:video_java",
"androidapp/third_party/autobanh:autobanh_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
}
@ -864,7 +864,7 @@ if (is_android) {
"../sdk/android:peerconnection_java",
"../sdk/android:video_api_java",
"../sdk/android:video_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
}
@ -880,7 +880,7 @@ if (is_android) {
"../rtc_base:base_java",
"../sdk/android:libjingle_peerconnection_java",
"../sdk/android:libjingle_peerconnection_metrics_default_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
}

2
examples/aarproject/app/build.gradle
View File

@ -46,7 +46,7 @@ dependencies {
implementation fileTree(dir: project.aarDir, include: ['google-webrtc-*.aar'])
}
implementation fileTree(dir: '../../androidapp/third_party/autobanh/lib', include: ['autobanh.jar'])
implementation 'com.android.support:support-annotations:26.1.0'
implementation 'androidx.annotation:annotation:1.2.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

5
examples/aarproject/gradle.properties
View File

@ -15,3 +15,8 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

2
examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
View File

@ -20,8 +20,8 @@ import android.media.AudioDeviceInfo;
import android.media.AudioManager;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

2
examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
View File

@ -24,8 +24,8 @@ import android.media.AudioManager;
import android.os.Handler;
import android.os.Looper;
import android.os.Process;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.util.List;
import java.util.Set;
import org.appspot.apprtc.util.AppRTCUtils;

2
examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
View File

@ -16,8 +16,8 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Build;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import org.appspot.apprtc.util.AppRTCUtils;
import org.webrtc.ThreadUtils;

2
examples/androidapp/src/org/appspot/apprtc/CallActivity.java
View File

@ -24,7 +24,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View;
@ -32,6 +31,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;
import android.widget.Toast;
import androidx.annotation.Nullable;
import java.io.IOException;
import java.lang.RuntimeException;
import java.util.ArrayList;

2
examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
View File

@ -22,7 +22,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.ContextMenu;
import android.view.KeyEvent;
@ -38,6 +37,7 @@ import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.TextView;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Random;
import org.json.JSONArray;

2
examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
View File

@ -17,8 +17,8 @@ import android.content.IntentFilter;
import android.os.BatteryManager;
import android.os.Build;
import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;

2
examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
View File

@ -10,8 +10,8 @@
package org.appspot.apprtc;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

2
examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View File

@ -13,8 +13,8 @@ package org.appspot.apprtc;
import android.content.Context;
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;

2
examples/androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java
View File

@ -12,8 +12,8 @@ package org.appspot.apprtc;
import android.media.AudioFormat;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;

2
examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
View File

@ -10,8 +10,8 @@
package org.appspot.apprtc;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;

2
examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
View File

@ -11,8 +11,8 @@
package org.appspot.apprtc;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import de.tavendo.autobahn.WebSocket.WebSocketConnectionObserver;
import de.tavendo.autobahn.WebSocketConnection;
import de.tavendo.autobahn.WebSocketException;

2
examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
View File

@ -12,8 +12,8 @@ package org.appspot.apprtc;
import android.os.Handler;
import android.os.HandlerThread;
import android.support.annotation.Nullable;
import android.util.Log;
import androidx.annotation.Nullable;
import org.appspot.apprtc.RoomParametersFetcher.RoomParametersFetcherEvents;
import org.appspot.apprtc.WebSocketChannelClient.WebSocketChannelEvents;
import org.appspot.apprtc.WebSocketChannelClient.WebSocketConnectionState;

2
examples/androidnativeapi/BUILD.gn
View File

@ -21,7 +21,7 @@ if (is_android) {
"//sdk/android:surfaceviewrenderer_java",
"//sdk/android:video_api_java",
"//sdk/android:video_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
shared_libraries = [ ":examples_androidnativeapi_jni" ]

2
examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/MainActivity.java
View File

@ -13,8 +13,8 @@ package org.webrtc.examples.androidnativeapi;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.widget.Button;
import androidx.annotation.Nullable;
import org.webrtc.Camera1Enumerator;
import org.webrtc.Camera2Enumerator;
import org.webrtc.CameraEnumerator;

2
examples/unityplugin/java/src/org/webrtc/UnityUtility.java
View File

@ -11,7 +11,7 @@
package org.webrtc;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
public class UnityUtility {
private static final String VIDEO_CAPTURER_THREAD_NAME = "VideoCapturerThread";