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

Side by Side Diff: build/all.gyp

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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) 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 { 5 {
6 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'dependencies': [ 73 'dependencies': [
74 '../content/content_shell_and_tests.gyp:*', 74 '../content/content_shell_and_tests.gyp:*',
75 # TODO: This should build on Android and the target should move to t he list above. 75 # TODO: This should build on Android and the target should move to t he list above.
76 '../sync/sync.gyp:*', 76 '../sync/sync.gyp:*',
77 ], 77 ],
78 }], 78 }],
79 ['OS!="ios" and OS!="android"', { 79 ['OS!="ios" and OS!="android"', {
80 'dependencies': [ 80 'dependencies': [
81 '../third_party/re2/re2.gyp:re2', 81 '../third_party/re2/re2.gyp:re2',
82 '../chrome/chrome.gyp:*', 82 '../chrome/chrome.gyp:*',
83 '../chrome/tools/profile_reset/jtl_compiler.gyp:*',
83 '../cc/blink/cc_blink_tests.gyp:*', 84 '../cc/blink/cc_blink_tests.gyp:*',
84 '../cc/cc_tests.gyp:*', 85 '../cc/cc_tests.gyp:*',
85 '../device/bluetooth/bluetooth.gyp:*', 86 '../device/bluetooth/bluetooth.gyp:*',
86 '../device/device_tests.gyp:*', 87 '../device/device_tests.gyp:*',
87 '../device/usb/usb.gyp:*', 88 '../device/usb/usb.gyp:*',
88 '../gin/gin.gyp:*', 89 '../gin/gin.gyp:*',
89 '../gpu/gpu.gyp:*', 90 '../gpu/gpu.gyp:*',
90 '../gpu/tools/tools.gyp:*', 91 '../gpu/tools/tools.gyp:*',
91 '../ipc/ipc.gyp:*', 92 '../ipc/ipc.gyp:*',
92 '../ipc/mojo/ipc_mojo.gyp:*', 93 '../ipc/mojo/ipc_mojo.gyp:*',
(...skipping 1195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 'dependencies': [ 1289 'dependencies': [
1289 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1290 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1290 '../ui/views/views.gyp:views', 1291 '../ui/views/views.gyp:views',
1291 '../ui/views/views.gyp:views_unittests', 1292 '../ui/views/views.gyp:views_unittests',
1292 ], 1293 ],
1293 }, # target_name: macviews_builder 1294 }, # target_name: macviews_builder
1294 ], # targets 1295 ], # targets
1295 }], # os=='mac' and toolkit_views==1 1296 }], # os=='mac' and toolkit_views==1
1296 ], # conditions 1297 ], # conditions
1297 } 1298 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698