From 7d9305f473cb6feccdf24b4435d550ba07201e42 Mon Sep 17 00:00:00 2001
From: Henrik Kjellander <kjellander@webrtc.org>
Date: Tue, 27 Dec 2016 09:21:19 +0100
Subject: [PATCH] Remove WebRTC-specific test runner script for Android

After moving away from the Chromium checkout and the symlinks, we
no longer need to have our own test_runner.py script for Android tests

BUG=webrtc:5006
TBR=ehmaldonado@webrtc.org

Review-Url: https://codereview.webrtc.org/2600193002 .
Cr-Commit-Position: refs/heads/master@{#15801}
---
 build_overrides/build.gni           |  2 --
 webrtc/base/BUILD.gn                |  4 ---
 webrtc/build/android/test_runner.py | 38 -----------------------------
 webrtc/test/BUILD.gn                |  3 ---
 4 files changed, 47 deletions(-)
 delete mode 100755 webrtc/build/android/test_runner.py

diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index 3dce159d22..10a2df9b05 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -42,5 +42,3 @@ ignore_elf32_limitations = true
 # Use system Xcode installation instead of the Chromium bundled Mac toolchain,
 # since it contains only SDK 10.11, not 10.12 which WebRTC needs.
 use_system_xcode = true
-
-android_test_runner_script = "../../webrtc/build/android/test_runner.py"
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 60ac7d4e4f..51beb8eab6 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -763,9 +763,5 @@ if (is_android) {
     deps = [
       "//base:base_java",
     ]
-
-    data = [
-      "//webrtc/build/android/test_runner.py",
-    ]
   }
 }
diff --git a/webrtc/build/android/test_runner.py b/webrtc/build/android/test_runner.py
deleted file mode 100755
index f2bc801d20..0000000000
--- a/webrtc/build/android/test_runner.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-"""
-Runs tests on Android devices.
-
-This script exists to avoid WebRTC being broken by changes in the Chrome Android
-test execution toolchain. It also conveniently sets the CHECKOUT_SOURCE_ROOT
-environment variable.
-"""
-
-import os
-import sys
-
-SCRIPT_DIR = os.path.dirname(__file__)
-SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir,
-                                       os.pardir))
-CHROMIUM_BUILD_ANDROID_DIR = os.path.join(SRC_DIR, 'build', 'android')
-sys.path.insert(0, CHROMIUM_BUILD_ANDROID_DIR)
-
-
-import test_runner  # pylint: disable=W0406
-
-def main():
-  # Override environment variable to make it possible for the scripts to find
-  # the root directory (our symlinking of the Chromium build toolchain would
-  # otherwise make them fail to do so).
-  os.environ['CHECKOUT_SOURCE_ROOT'] = SRC_DIR
-  return test_runner.main()
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index a6e08abf49..c8f60f5e73 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -164,9 +164,6 @@ rtc_source_set("test_support") {
 
   if (is_android) {
     deps += [ "//base:base" ]
-    data = [
-      "../build/android/test_runner.py",
-    ]
   }
 
   if (rtc_use_memcheck) {