Make instrumentation test dependency on a support APK explicit

build/android/pylib/instrumentation/test_package.py

Index: build/android/pylib/instrumentation/test_package.py
diff --git a/build/android/pylib/instrumentation/test_package.py b/build/android/pylib/instrumentation/test_package.py
index f32556f33d00c5fc799a7b28d98adb9a5de31df4..c44e16d4432b8dba6f4d04de7346e604da5dfe07 100644
--- a/build/android/pylib/instrumentation/test_package.py
+++ b/build/android/pylib/instrumentation/test_package.py
@@ -1,3 +1,4 @@
+
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -16,6 +17,8 @@ class TestPackage(test_jar.TestJar):
 
     if not os.path.exists(apk_path):
       raise Exception('%s not found, please build it' % apk_path)
+    if not os.path.exists(test_support_apk_path):

[jbudorick, 2015/06/24 13:05:11]

As written, this requires each test apk have a test support apk. I don't think
we want to do that.

[dgn, 2015/06/24 14:06:53]

Right, we don't. I'm currently rewriting the CL. I'll add an argument to the
script, and from gyp/gn, it will be possible to specify a support apk. then if
that support apk isn't there, the script will raise an exception.

[dgn, 2015/06/24 16:03:04]

Done.

+      raise Exception('%s not found, please build it' % test_support_apk_path)
     self._apk_path = apk_path
     self._apk_name = os.path.splitext(os.path.basename(apk_path))[0]
     self._package_name = apk_helper.GetPackageName(self._apk_path)