diff options
| author | sgurun@chromium.org <sgurun@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 09:20:40 +0000 |
|---|---|---|
| committer | sgurun@chromium.org <sgurun@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 09:20:40 +0000 |
| commit | 89abf34d9aa3270b32c9986289a891c75feb33f1 (patch) | |
| tree | 34ee9d5e763e54fd649ae44128117e25a36b6652 /components/components_tests.gypi | |
| parent | 2ec99f27910b50eb38ca6c6c7cf1fb886849e671 (diff) | |
| download | chromium_src-89abf34d9aa3270b32c9986289a891c75feb33f1.zip chromium_src-89abf34d9aa3270b32c9986289a891c75feb33f1.tar.gz chromium_src-89abf34d9aa3270b32c9986289a891c75feb33f1.tar.bz2 | |
fix automerger issue for android_webview.
Android webview does not merge third party repo sync. So making it
conditional to fix auto merger problem.
TBR=joi@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14576002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/components_tests.gypi')
| -rw-r--r-- | components/components_tests.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/components_tests.gypi b/components/components_tests.gypi index bf79fec..9919247 100644 --- a/components/components_tests.gypi +++ b/components/components_tests.gypi @@ -40,7 +40,6 @@ 'navigation_interception', # Dependencies of sessions - '../sync/sync.gyp:sync', '../third_party/protobuf/protobuf.gyp:protobuf_lite', 'sessions', 'sessions_test_support', @@ -64,6 +63,11 @@ '../base/allocator/allocator.gyp:allocator', ], }], + ['android_webview_build == 0', { + 'dependencies': [ + '../sync/sync.gyp:sync', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], |