From babf8ee78c87f8965f2883b09d3dede6e3e3e247 Mon Sep 17 00:00:00 2001
From: agrieve <agrieve@chromium.org>
Date: Fri, 8 Apr 2016 06:54:23 -0700
Subject: [PATCH] Add test runner scripts for instrumentation tests

BUG=599919
NOTRY=True
TBR=perkj@webrtc.org

Review URL: https://codereview.webrtc.org/1863363002

Cr-Commit-Position: refs/heads/master@{#12294}
---
 webrtc/api/api_tests.gyp   | 7 ++++++-
 webrtc/webrtc_examples.gyp | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/webrtc/api/api_tests.gyp b/webrtc/api/api_tests.gyp
index b7cbd687ad..7cefd135b6 100644
--- a/webrtc/api/api_tests.gyp
+++ b/webrtc/api/api_tests.gyp
@@ -131,9 +131,14 @@
             'resource_dir': 'androidtests/res',
             'native_lib_target': 'libjingle_peerconnection_so',
             'is_test_apk': 1,
+            'test_type': 'instrumentation',
+            'tested_apk_path': '',
             'never_lint': 1,
           },
-          'includes': [ '../../build/java_apk.gypi' ],
+          'includes': [
+            '../../build/java_apk.gypi',
+            '../../build/android/test_runner.gypi',
+          ],
         },
       ],  # targets
     }],  # OS=="android"
diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp
index d5d8adefd9..4a1ff0aea2 100755
--- a/webrtc/webrtc_examples.gyp
+++ b/webrtc/webrtc_examples.gyp
@@ -454,8 +454,13 @@
             'apk_name': 'AppRTCDemoTest',
             'java_in_dir': 'examples/androidtests',
             'is_test_apk': 1,
+            'test_type': 'instrumentation',
+            'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
           },
-          'includes': [ '../build/java_apk.gypi' ],
+          'includes': [
+            '../build/java_apk.gypi',
+            '../build/android/test_runner.gypi',
+          ],
         },
       ],  # targets
     }],  # OS=="android"