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

Side by Side Diff: components/components.gyp

Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile fixes following rebase Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 'sessions.gypi', 64 'sessions.gypi',
65 'signin.gypi', 65 'signin.gypi',
66 'startup_metric_utils.gypi', 66 'startup_metric_utils.gypi',
67 'suggestions.gypi', 67 'suggestions.gypi',
68 'sync_driver.gypi', 68 'sync_driver.gypi',
69 'translate.gypi', 69 'translate.gypi',
70 'ui_zoom.gypi', 70 'ui_zoom.gypi',
71 'undo.gypi', 71 'undo.gypi',
72 'update_client.gypi', 72 'update_client.gypi',
73 'url_fixer.gypi', 73 'url_fixer.gypi',
74 'url_formatter.gypi',
74 'url_matcher.gypi', 75 'url_matcher.gypi',
75 'user_prefs.gypi', 76 'user_prefs.gypi',
76 'variations.gypi', 77 'variations.gypi',
77 'wallpaper.gypi', 78 'wallpaper.gypi',
78 'web_resource.gypi', 79 'web_resource.gypi',
79 'webdata.gypi', 80 'webdata.gypi',
80 'webdata_services.gypi', 81 'webdata_services.gypi',
81 ], 82 ],
82 'conditions': [ 83 'conditions': [
83 ['OS == "android"', { 84 ['OS == "android"', {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 }], 159 }],
159 # TODO(tbarzic): Remove chromeos condition when there are non-chromeos apps 160 # TODO(tbarzic): Remove chromeos condition when there are non-chromeos apps
160 # in components/apps. 161 # in components/apps.
161 ['enable_extensions == 1 and chromeos == 1', { 162 ['enable_extensions == 1 and chromeos == 1', {
162 'includes': [ 163 'includes': [
163 'chrome_apps.gypi', 164 'chrome_apps.gypi',
164 ], 165 ],
165 }], 166 }],
166 ], 167 ],
167 } 168 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698