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/sessions.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/sessions.gypi')
| -rw-r--r-- | components/sessions.gypi | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/components/sessions.gypi b/components/sessions.gypi index d8820b8..2741a3d 100644 --- a/components/sessions.gypi +++ b/components/sessions.gypi @@ -12,7 +12,6 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../content/content.gyp:content_browser', '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync', '../third_party/protobuf/protobuf.gyp:protobuf_lite', ], 'include_dirs': [ @@ -31,6 +30,11 @@ '../webkit/support/webkit_support.gyp:glue', ] }], + ['android_webview_build == 0', { + 'dependencies': [ + '../sync/sync.gyp:sync', + ] + }], ], }, { @@ -39,7 +43,6 @@ 'defines!': ['SESSIONS_IMPLEMENTATION'], 'dependencies': [ '../skia/skia.gyp:skia', - '../sync/sync.gyp:sync', '../testing/gtest.gyp:gtest', ], 'include_dirs': [ @@ -49,6 +52,13 @@ 'sessions/serialized_navigation_entry_test_helper.cc', 'sessions/serialized_navigation_entry_test_helper.h', ], + 'conditions': [ + ['android_webview_build == 0', { + 'dependencies': [ + '../sync/sync.gyp:sync', + ] + }], + ], }, ], } |