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

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: Rebase. 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
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 'dependencies': [ 91 'dependencies': [
92 '../content/content_shell_and_tests.gyp:*', 92 '../content/content_shell_and_tests.gyp:*',
93 # TODO: This should build on Android and the target should move to t he list above. 93 # TODO: This should build on Android and the target should move to t he list above.
94 '../sync/sync.gyp:*', 94 '../sync/sync.gyp:*',
95 ], 95 ],
96 }], 96 }],
97 ['OS!="ios" and OS!="android"', { 97 ['OS!="ios" and OS!="android"', {
98 'dependencies': [ 98 'dependencies': [
99 '../third_party/re2/re2.gyp:re2', 99 '../third_party/re2/re2.gyp:re2',
100 '../chrome/chrome.gyp:*', 100 '../chrome/chrome.gyp:*',
101 '../chrome/tools/profile_reset/jtl_compiler.gyp:*',
101 '../cc/blink/cc_blink_tests.gyp:*', 102 '../cc/blink/cc_blink_tests.gyp:*',
102 '../cc/cc_tests.gyp:*', 103 '../cc/cc_tests.gyp:*',
103 '../device/bluetooth/bluetooth.gyp:*', 104 '../device/bluetooth/bluetooth.gyp:*',
104 '../device/device_tests.gyp:*', 105 '../device/device_tests.gyp:*',
105 '../device/usb/usb.gyp:*', 106 '../device/usb/usb.gyp:*',
106 '../gin/gin.gyp:*', 107 '../gin/gin.gyp:*',
107 '../gpu/gpu.gyp:*', 108 '../gpu/gpu.gyp:*',
108 '../gpu/tools/tools.gyp:*', 109 '../gpu/tools/tools.gyp:*',
109 '../ipc/ipc.gyp:*', 110 '../ipc/ipc.gyp:*',
110 '../ipc/mojo/ipc_mojo.gyp:*', 111 '../ipc/mojo/ipc_mojo.gyp:*',
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 'dependencies': [ 1309 'dependencies': [
1309 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1310 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1310 '../ui/views/views.gyp:views', 1311 '../ui/views/views.gyp:views',
1311 '../ui/views/views.gyp:views_unittests', 1312 '../ui/views/views.gyp:views_unittests',
1312 ], 1313 ],
1313 }, # target_name: macviews_builder 1314 }, # target_name: macviews_builder
1314 ], # targets 1315 ], # targets
1315 }], # os=='mac' and toolkit_views==1 1316 }], # os=='mac' and toolkit_views==1
1316 ], # conditions 1317 ], # conditions
1317 } 1318 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698