Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: components/sessions.gypi

Issue 1041673002: Remove "easy" android_webview_build conditions from components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/resources/components_resources.grd ('k') | components/sessions/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sessions.gypi
diff --git a/components/sessions.gypi b/components/sessions.gypi
index ce930d87bac40c1cbaba011ae77284137ad0f573..25dd69a41a3b19812671d1b51840d755e9ba9054 100644
--- a/components/sessions.gypi
+++ b/components/sessions.gypi
@@ -42,6 +42,7 @@
'defines!': ['SESSIONS_IMPLEMENTATION'],
'dependencies': [
'../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
@@ -53,11 +54,6 @@
'sessions/serialized_navigation_entry_test_helper.h',
],
'conditions': [
- ['android_webview_build == 0', {
- 'dependencies': [
- '../sync/sync.gyp:sync',
- ]
- }],
['OS!="ios" and OS!="android"', {
'sources': [
'sessions/base_session_service_test_helper.cc',
@@ -83,6 +79,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../content/content.gyp:content_browser',
'../skia/skia.gyp:skia',
+ '../sync/sync.gyp:sync',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../ui/base/ui_base.gyp:ui_base',
'../ui/gfx/gfx.gyp:gfx_geometry',
@@ -103,13 +100,6 @@
'sessions/content/content_serialized_navigation_driver.cc',
'sessions/content/content_serialized_navigation_driver.h',
],
- 'conditions': [
- ['android_webview_build == 0', {
- 'dependencies': [
- '../sync/sync.gyp:sync',
- ]
- }],
- ],
},
],
}, { # OS==ios
« no previous file with comments | « components/resources/components_resources.grd ('k') | components/sessions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698