commit 0759249370e0167111d8654476bda108eddd8b76
author Mirko Bonadei <mbonadei@webrtc.org> Tue Mar 10 14:38:49 2020
committer Commit Bot <commit-bot@chromium.org> Wed Mar 11 08:29:06 2020
tree 0aef2d77f81c2a68fa00d0d19cd243db258dd01f
parent c69fd592707ad9fd982425b67308718dbe20ac2e

Fix 'all' build on Android platforms.

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}

DEPS

diff --git a/DEPS b/DEPS
index bfefd09..a8bd168 100644
--- a/DEPS
+++ b/DEPS
@@ -82,6 +82,17 @@
     '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': {
       'packages': [
           {
@@ -106,6 +117,8 @@
 
   'src/third_party/boringssl/src':
     'https://boringssl.googlesource.com/boringssl.git@1e859054c31ec7b974e998373e85fadea56d93ad',
+  'src/third_party/breakpad/breakpad':
+    'https://chromium.googlesource.com/breakpad/breakpad.git@f32b83eb08e9ee158d3037b2114357187fd45a05',
   'src/third_party/catapult':
     'https://chromium.googlesource.com/catapult.git@8bf3aecd3335cc7b678c2d3ba24eaab6c43de13c',
   'src/third_party/ced/src': {

rtc_tools/network_tester/BUILD.gn

diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 8c3a018..96f8533 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -101,7 +101,7 @@
     testonly = true
     apk_name = "NetworkTesterMobile"
     android_manifest = "androidapp/AndroidManifest.xml"
-    min_sdk_version = 17
+    min_sdk_version = 16
     target_sdk_version = 24
 
     deps = [

rtc_tools/network_tester/androidapp/AndroidManifest.xml

diff --git a/rtc_tools/network_tester/androidapp/AndroidManifest.xml b/rtc_tools/network_tester/androidapp/AndroidManifest.xml
index f391063..3839955 100755
--- a/rtc_tools/network_tester/androidapp/AndroidManifest.xml
+++ b/rtc_tools/network_tester/androidapp/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-sdk android:minSdkVersion="17"
+    <uses-sdk android:minSdkVersion="16"
     android:targetSdkVersion="24"
     android:maxSdkVersion="24" />
     <application
@@ -21,4 +21,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>

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

diff --git a/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java b/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
index 2a78d6b..33f442f 100644
--- a/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
+++ b/rtc_tools/network_tester/androidapp/src/com/google/media/networktester/MainActivity.java
@@ -11,12 +11,8 @@
 package com.google.media.networktester;
 
 import android.app.Activity;
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.ParcelFileDescriptor;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager;
@@ -25,7 +21,7 @@
 public class MainActivity extends Activity {
   Button startButton;
   Button stopButton;
-  NetworkTester networkTester = null;
+  NetworkTester networkTester;
   Handler mainThreadHandler;
 
   @Override