From ea938c0c499913d25e536d475aad0c8ea4de282a Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Fri, 16 Sep 2016 05:21:08 -0700
Subject: [PATCH] Remove Android tests GYP target.

BUG=webrtc:6365
NOTRY=True

Review-Url: https://codereview.webrtc.org/2345743004
Cr-Commit-Position: refs/heads/master@{#14257}
---
 webrtc/build/android_tests.gyp      | 44 -----------------------------
 webrtc/build/android_tests_noop.gyp | 17 -----------
 webrtc/build/common.gypi            |  4 ---
 3 files changed, 65 deletions(-)
 delete mode 100644 webrtc/build/android_tests.gyp
 delete mode 100644 webrtc/build/android_tests_noop.gyp

diff --git a/webrtc/build/android_tests.gyp b/webrtc/build/android_tests.gyp
deleted file mode 100644
index ab609f70c6..0000000000
--- a/webrtc/build/android_tests.gyp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2013 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.
-
-# This file exists in two versions. A no-op version under
-# webrtc/build/android_tests_noop.gyp and this one. This gyp file builds the
-# tests (for Android) assuming that WebRTC is built inside a Chromium
-# workspace. The no-op version is included when building WebRTC without
-# Chromium. This is a workaround for the fact that 'includes' don't expand
-# variables and that the relative location of apk_test.gypi is different for
-# WebRTC when built as part of Chromium and when it is built without Chromium.
-{
-  'includes': [
-    'common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'android_junit_tests',
-      'type': 'none',
-      'dependencies': [
-        '<(webrtc_root)/api/api_java.gyp:libjingle_peerconnection_java',
-        '<(DEPTH)/base/base.gyp:base_java',
-        '<(DEPTH)/base/base.gyp:base_java_test_support',
-        '<(DEPTH)/base/base.gyp:base_junit_test_support',
-      ],
-      'variables': {
-        'main_class': 'org.chromium.testing.local.JunitTestMain',
-        'src_paths': [
-          '../androidjunit/',
-        ],
-        'test_type': 'junit',
-        'wrapper_script_name': 'helper/<(_target_name)',
-      },
-      'includes': [
-        '../../build/android/test_runner.gypi',
-        '../../build/host_jar.gypi',
-      ],
-    },
-  ],
-}
diff --git a/webrtc/build/android_tests_noop.gyp b/webrtc/build/android_tests_noop.gyp
deleted file mode 100644
index d3c981cd2a..0000000000
--- a/webrtc/build/android_tests_noop.gyp
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2013 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.
-
-# See webrtc/build/android_tests.gyp for more information about this file.
-{
-  'targets': [
-    {
-      'target_name': 'android_junit_tests',
-      'type': 'none',
-    },
-  ],
-}
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index a2db0c8d56..2bdfbfed6f 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -34,10 +34,8 @@
 
           ['build_with_chromium==1', {
             'webrtc_root%': '<(DEPTH)/third_party/webrtc',
-            'android_tests_path%': '<(DEPTH)/third_party/webrtc/build/android_tests_noop.gyp',
           }, {
             'webrtc_root%': '<(DEPTH)/webrtc',
-            'android_tests_path%': '<(DEPTH)/webrtc/build/android_tests.gyp',
           }],
 
           # Controls whether we use libevent on posix platforms.
@@ -57,7 +55,6 @@
       'build_libevent%': '<(build_libevent)',
       'enable_libevent%': '<(enable_libevent)',
       'webrtc_root%': '<(webrtc_root)',
-      'android_tests_path%': '<(android_tests_path)',
       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
       'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9',
       'include_ilbc%': '<(include_ilbc)',
@@ -69,7 +66,6 @@
     'build_libevent%': '<(build_libevent)',
     'enable_libevent%': '<(enable_libevent)',
     'webrtc_root%': '<(webrtc_root)',
-    'android_tests_path%': '<(android_tests_path)',
     'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
     'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',