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

Side by Side Diff: chrome/chrome.gyp

Issue 10777012: Disable uses of ProfileImportProcess on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Yaron's comments Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'type': 'static_library', 244 'type': 'static_library',
245 'variables': { 'enable_wexit_time_destructors': 1, }, 245 'variables': { 'enable_wexit_time_destructors': 1, },
246 'dependencies': [ 246 'dependencies': [
247 '../base/base.gyp:base', 247 '../base/base.gyp:base',
248 '../content/content.gyp:content_utility', 248 '../content/content.gyp:content_utility',
249 '../skia/skia.gyp:skia', 249 '../skia/skia.gyp:skia',
250 ], 250 ],
251 'sources': [ 251 'sources': [
252 'utility/chrome_content_utility_client.cc', 252 'utility/chrome_content_utility_client.cc',
253 'utility/chrome_content_utility_client.h', 253 'utility/chrome_content_utility_client.h',
254 'utility/profile_import_handler.cc',
255 'utility/profile_import_handler.h',
256 'utility/profile_import_handler_android.cc',
254 ], 257 ],
255 'include_dirs': [ 258 'include_dirs': [
256 '..', 259 '..',
257 ], 260 ],
258 'conditions': [ 261 'conditions': [
259 ['toolkit_uses_gtk == 1', { 262 ['toolkit_uses_gtk == 1', {
260 'dependencies': [ 263 'dependencies': [
261 '../build/linux/system.gyp:gtk', 264 '../build/linux/system.gyp:gtk',
262 ], 265 ],
263 }], 266 }],
267 ['OS=="android"', {
268 'sources!': [
269 'utility/profile_import_handler.cc',
270 'utility/profile_import_handler.h',
271 ],
272 }],
264 ], 273 ],
265 }, 274 },
266 { 275 {
267 'target_name': 'service', 276 'target_name': 'service',
268 'type': 'static_library', 277 'type': 'static_library',
269 'variables': { 'enable_wexit_time_destructors': 1, }, 278 'variables': { 'enable_wexit_time_destructors': 1, },
270 'dependencies': [ 279 'dependencies': [
271 'chrome_resources.gyp:chrome_strings', 280 'chrome_resources.gyp:chrome_strings',
272 'common', 281 'common',
273 'common_net', 282 'common_net',
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 'sources': [ 1064 'sources': [
1056 'browser/safe_browsing/signature_util.h', 1065 'browser/safe_browsing/signature_util.h',
1057 'browser/safe_browsing/signature_util_win.cc', 1066 'browser/safe_browsing/signature_util_win.cc',
1058 'tools/safe_browsing/sb_sigutil.cc', 1067 'tools/safe_browsing/sb_sigutil.cc',
1059 ], 1068 ],
1060 }, 1069 },
1061 ]}, # 'targets' 1070 ]}, # 'targets'
1062 ], # OS=="win" 1071 ], # OS=="win"
1063 ], # 'conditions' 1072 ], # 'conditions'
1064 } 1073 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/all_messages.h » ('j') | chrome/utility/chrome_content_utility_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698