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

Side by Side Diff: build/common.gypi

Issue 11275284: [cros,rlz] Financial ping livelock fix and proper shutdown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable on Chromium for testing (DO NOT COMMIT) Created 8 years, 1 month 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
« no previous file with comments | « no previous file | rlz/chromeos/lib/rlz_value_store_chromeos.h » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1390 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 'win_release_InlineFunctionExpansion': '1', 1401 'win_release_InlineFunctionExpansion': '1',
1402 'win_release_OmitFramePointers': '0', 1402 'win_release_OmitFramePointers': '0',
1403 # Ditto for debug, to support bumping win_debug_Optimization. 1403 # Ditto for debug, to support bumping win_debug_Optimization.
1404 'win_debug_InlineFunctionExpansion': 0, 1404 'win_debug_InlineFunctionExpansion': 0,
1405 'win_debug_OmitFramePointers': 0, 1405 'win_debug_OmitFramePointers': 0,
1406 # Keep the code under #ifndef NVALGRIND. 1406 # Keep the code under #ifndef NVALGRIND.
1407 'release_valgrind_build': 1, 1407 'release_valgrind_build': 1,
1408 }], 1408 }],
1409 1409
1410 # Enable RLZ on Win and Mac. 1410 # Enable RLZ on Win and Mac.
1411 ['branding=="Chrome" and (OS=="win" or OS=="mac")', { 1411 ['OS=="win" or OS=="mac"', {
Roger Tawa OOO till Jul 10th 2012/11/15 16:06:19 this line won't be committed right?
Ivan Korotkov 2012/11/15 16:30:15 Right, this is for trybots.
1412 'enable_rlz%': 1, 1412 'enable_rlz%': 1,
1413 }], 1413 }],
1414 ], 1414 ],
1415 1415
1416 # List of default apps to install in new profiles. The first list contains 1416 # List of default apps to install in new profiles. The first list contains
1417 # the source files as found in svn. The second list, used only for linux, 1417 # the source files as found in svn. The second list, used only for linux,
1418 # contains the destination location for each of the files. When a crx 1418 # contains the destination location for each of the files. When a crx
1419 # is added or removed from the list, the chrome/browser/resources/ 1419 # is added or removed from the list, the chrome/browser/resources/
1420 # default_apps/external_extensions.json file must also be updated. 1420 # default_apps/external_extensions.json file must also be updated.
1421 'default_apps_list': [ 1421 'default_apps_list': [
(...skipping 2311 matching lines...) Expand 10 before | Expand all | Expand 10 after
3733 # settings in target dicts. SYMROOT is a special case, because many other 3733 # settings in target dicts. SYMROOT is a special case, because many other
3734 # Xcode variables depend on it, including variables such as 3734 # Xcode variables depend on it, including variables such as
3735 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3735 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3736 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3736 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3737 # files to appear (when present) in the UI as actual files and not red 3737 # files to appear (when present) in the UI as actual files and not red
3738 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3738 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3739 # and therefore SYMROOT, needs to be set at the project level. 3739 # and therefore SYMROOT, needs to be set at the project level.
3740 'SYMROOT': '<(DEPTH)/xcodebuild', 3740 'SYMROOT': '<(DEPTH)/xcodebuild',
3741 }, 3741 },
3742 } 3742 }
OLDNEW
« no previous file with comments | « no previous file | rlz/chromeos/lib/rlz_value_store_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698