diff options
| author | Mirko Bonadei <mbonadei@webrtc.org> | 2020-03-10 15:38:49 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-11 08:29:06 +0000 |
| commit | 0759249370e0167111d8654476bda108eddd8b76 (patch) | |
| tree | 0aef2d77f81c2a68fa00d0d19cd243db258dd01f /rtc_tools | |
| parent | c69fd592707ad9fd982425b67308718dbe20ac2e (diff) | |
| download | webrtc-0759249370e0167111d8654476bda108eddd8b76.tar.gz | |
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}
Diffstat (limited to 'rtc_tools')
3 files changed, 4 insertions, 8 deletions
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn index 8c3a0186d7..96f853388d 100644 --- a/rtc_tools/network_tester/BUILD.gn +++ b/rtc_tools/network_tester/BUILD.gn @@ -101,7 +101,7 @@ if (is_android) { testonly = true apk_name = "NetworkTesterMobile" android_manifest = "androidapp/AndroidManifest.xml" - min_sdk_version = 17 + min_sdk_version = 16 target_sdk_version = 24 deps = [ diff --git a/rtc_tools/network_tester/androidapp/AndroidManifest.xml b/rtc_tools/network_tester/androidapp/AndroidManifest.xml index f391063f6d..3839955458 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> 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 2a78d6b9f9..33f442fce2 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 @@ import android.widget.Button; public class MainActivity extends Activity { Button startButton; Button stopButton; - NetworkTester networkTester = null; + NetworkTester networkTester; Handler mainThreadHandler; @Override |