diff options
| author | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 18:27:55 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 18:27:55 +0000 |
| commit | 315a020eac593c5e7f3bc46c5b9ebacd45842e68 (patch) | |
| tree | 9d6c662f80f147924ba29212b8d19aa4c68a667f /base/base.gyp | |
| parent | 81b80bc3cf5015aa36bd2d65dfd011d5e93d58ad (diff) | |
| download | chromium_src-315a020eac593c5e7f3bc46c5b9ebacd45842e68.zip chromium_src-315a020eac593c5e7f3bc46c5b9ebacd45842e68.tar.gz chromium_src-315a020eac593c5e7f3bc46c5b9ebacd45842e68.tar.bz2 | |
Move base_java_test_support out of gtest_target_type == shared_library' guard.
"base_java_test_support" is needed by all the java instrumentation tests on Chromium Android. Move it out the 'gtest_target_type == shared_library' gurad and make sure that running 'android_gyp' can pass with or without 'gtest_target_type == shared_library'.
BUG=None
TEST=running 'android_gyp' passes with 'gtest_target_type == executable'
Review URL: https://chromiumcodereview.appspot.com/10874079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/base/base.gyp b/base/base.gyp index 1d6b37e..682eec1 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -940,6 +940,18 @@ }, 'includes': [ '../build/java.gypi' ], }, + { + 'target_name': 'base_java_test_support', + 'type': 'none', + 'dependencies': [ + 'base_java', + ], + 'variables': { + 'package_name': 'base_javatests', + 'java_in_dir': '../base/android/javatests', + }, + 'includes': [ '../build/java.gypi' ], + }, ], }], ['OS == "win"', { @@ -979,18 +991,6 @@ }, 'includes': [ '../build/apk_test.gypi' ], }, - { - 'target_name': 'base_java_test_support', - 'type': 'none', - 'dependencies': [ - 'base_java', - ], - 'variables': { - 'package_name': 'base_javatests', - 'java_in_dir': '../base/android/javatests', - }, - 'includes': [ '../build/java.gypi' ], - }, ], }], ['test_isolation_mode != "noop"', { |