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

Fix 'all' build on Android platforms.

Browse Source 
Example of failures when trying to build "all":
https://ci.chromium.org/p/webrtc/builders/try/android_arm64_rel/35549

Bug: webrtc:11411
Change-Id: Idf462c39eb499e5f6f7c971bce78c54d071f9871
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170113
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30753}
This commit is contained in:
Mirko Bonadei
2020-03-10 15:38:49 +01:00
committed by Commit Bot
parent c69fd59270
commit 0759249370
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DEPS
View File

@ -82,6 +82,17 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
'src/third_party/android_system_sdk': {
'packages': [
{
'package': 'chromium/third_party/android_system_sdk',
'version': '4IAlMU4jo15KjMPF3EUnrPZs0RYoPW8n9jSJ4dvHDWUC',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_build_tools/aapt2': { 'src/third_party/android_build_tools/aapt2': {
'packages': [ 'packages': [
{ {
@ -106,6 +117,8 @@ deps = {
'src/third_party/boringssl/src': 'src/third_party/boringssl/src':
'https://boringssl.googlesource.com/boringssl.git@1e859054c31ec7b974e998373e85fadea56d93ad', 'https://boringssl.googlesource.com/boringssl.git@1e859054c31ec7b974e998373e85fadea56d93ad',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@f32b83eb08e9ee158d3037b2114357187fd45a05',
'src/third_party/catapult': 'src/third_party/catapult':
'https://chromium.googlesource.com/catapult.git@8bf3aecd3335cc7b678c2d3ba24eaab6c43de13c', 'https://chromium.googlesource.com/catapult.git@8bf3aecd3335cc7b678c2d3ba24eaab6c43de13c',
'src/third_party/ced/src': { 'src/third_party/ced/src': {

2
rtc_tools/network_tester/BUILD.gn
View File

@ -101,7 +101,7 @@ if (is_android) {
testonly = true testonly = true
apk_name = "NetworkTesterMobile" apk_name = "NetworkTesterMobile"
android_manifest = "androidapp/AndroidManifest.xml" android_manifest = "androidapp/AndroidManifest.xml"
min_sdk_version = 17 min_sdk_version = 16
target_sdk_version = 24 target_sdk_version = 24
deps = [ deps = [

4
rtc_tools/network_tester/androidapp/AndroidManifest.xml
View File

@ -4,7 +4,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-sdk android:minSdkVersion="17" <uses-sdk android:minSdkVersion="16"
android:targetSdkVersion="24" android:targetSdkVersion="24"
android:maxSdkVersion="24" /> android:maxSdkVersion="24" />
<application <application
@ -21,4 +21,4 @@
</intent-filter> </intent-filter>
</activity> </activity>
</application> </application>
</manifest> </manifest>

6
rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
View File

@ -11,12 +11,8 @@
package com.google.media.networktester; package com.google.media.networktester;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.ParcelFileDescriptor;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.WindowManager; import android.view.WindowManager;
@ -25,7 +21,7 @@ import android.widget.Button;
public class MainActivity extends Activity { public class MainActivity extends Activity {
Button startButton; Button startButton;
Button stopButton; Button stopButton;
NetworkTester networkTester = null; NetworkTester networkTester;
Handler mainThreadHandler; Handler mainThreadHandler;
@Override @Override