diff options
| author | newt <newt@chromium.org> | 2015-06-25 13:30:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-25 20:30:35 +0000 |
| commit | a2a59a7d6c561a59beb84966e94be78fa7707d6c (patch) | |
| tree | 15e2069b892c27c88ceeb713c2553ad9b38f81a6 /chrome/chrome_tests.gypi | |
| parent | 89b099311e5e9fad6b06dad2a1e0e7e862ad9f6d (diff) | |
| download | chromium_src-a2a59a7d6c561a59beb84966e94be78fa7707d6c.zip chromium_src-a2a59a7d6c561a59beb84966e94be78fa7707d6c.tar.gz chromium_src-a2a59a7d6c561a59beb84966e94be78fa7707d6c.tar.bz2 | |
Merge javatests_staging into javatests.
This moves files from chrome/test/android/javatests_staging into
chrome/test/android/javatests and merges the
chrome_staging_test_support_java build target into
chrome_test_support_java.
BUG=501140
Review URL: https://codereview.chromium.org/1199263006
Cr-Commit-Position: refs/heads/master@{#336245}
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d3b6477..232cd0f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3085,7 +3085,10 @@ }, 'dependencies': [ 'chrome_java', + '../base/base.gyp:base_java', + '../base/base.gyp:base_java_test_support', '../content/content_shell_and_tests.gyp:content_java_test_support', + '../net/net.gyp:net_java', '../net/net.gyp:net_java_test_support', '../sync/sync.gyp:sync_java', '../sync/sync.gyp:sync_java_test_support', |