From 502525c9c963e9a3d23b630cfd82ffa300d073a2 Mon Sep 17 00:00:00 2001
From: "ppi@chromium.org"
 <ppi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 13 Aug 2013 23:46:39 +0000
Subject: Add dependency on android_tools in java_apk.gypi for all test apks.

This patch adds a dependency on entire android_tools target that contains
forwarder2 and md5sum to java_apk.gypi for all test apks, so that individual
test apk targets do not need to explicitly depend on the tools required to run
them.


BUG=271482

Review URL: https://chromiumcodereview.appspot.com/22865003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217386 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/java_apk.gypi             | 5 +++++
 chrome/chrome_tests.gypi        | 1 -
 content/content_tests.gypi      | 1 -
 tools/android/android_tools.gyp | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 2457d3a..0e550a0 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -371,6 +371,11 @@
         },
       ],
     }],
+    ['is_test_apk == 1', {
+      'dependencies': [
+        '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
+      ]
+    }],
   ],
   'actions': [
     {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c3725e9..ce1ee15 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3271,7 +3271,6 @@
             '../base/base.gyp:base_java_test_support',
             '../content/content.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
-            '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
           'variables': {
             'apk_name': 'ChromiumTestShellTest',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 59158ca..959b2d6 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1238,7 +1238,6 @@
             '../media/media.gyp:media_test_support',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
-            '../tools/android/forwarder2/forwarder.gyp:forwarder2',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',
diff --git a/tools/android/android_tools.gyp b/tools/android/android_tools.gyp
index 5aeb96f..c38cd70 100644
--- a/tools/android/android_tools.gyp
+++ b/tools/android/android_tools.gyp
@@ -5,7 +5,7 @@
 {
   'targets': [
     # Intermediate target grouping the android tools needed to run native
-    # unittests apks.
+    # unittests and instrumentation test apks.
     {
       'target_name': 'android_tools',
       'type': 'none',
-- 
cgit v1.1