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

Side by Side Diff: chrome/installer/mini_installer_syzygy.gyp

Issue 66163013: Fix disable_nacl=1 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | native_client_sdk/native_client_sdk_untrusted.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'version_py': '<(DEPTH)/chrome/tools/build/version.py', 6 'version_py': '<(DEPTH)/chrome/tools/build/version.py',
7 'version_path': '<(DEPTH)/chrome/VERSION', 7 'version_path': '<(DEPTH)/chrome/VERSION',
8 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', 8 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 'msvs_use_common_release': 0, 10 'msvs_use_common_release': 0,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 '<(PRODUCT_DIR)/syzygy/chrome_child.dll', 54 '<(PRODUCT_DIR)/syzygy/chrome_child.dll',
55 ], 55 ],
56 'output_dir': '<(PRODUCT_DIR)/syzygy', 56 'output_dir': '<(PRODUCT_DIR)/syzygy',
57 }, 57 },
58 # Bulk of the build configuration comes from here. 58 # Bulk of the build configuration comes from here.
59 'includes': [ 'mini_installer.gypi', ], 59 'includes': [ 'mini_installer.gypi', ],
60 }, 60 },
61 ], 61 ],
62 }], 62 }],
63 ], 63 ],
64 },{ 64 }, {
65 'targets': [], 65 'targets': [],
Joao da Silva 2013/11/14 08:03:03 This looks like the same issue
66 }], 66 }],
67 [ 'branding == "Chrome"', { 67 [ 'branding == "Chrome"', {
68 'variables': { 68 'variables': {
69 'branding_dir': '../app/theme/google_chrome', 69 'branding_dir': '../app/theme/google_chrome',
70 }, 70 },
71 }, { # else branding!="Chrome" 71 }, { # else branding!="Chrome"
72 'variables': { 72 'variables': {
73 'branding_dir': '../app/theme/chromium', 73 'branding_dir': '../app/theme/chromium',
74 }, 74 },
75 }], 75 }],
76 ], 76 ],
77 } 77 }
OLDNEW
« no previous file with comments | « no previous file | native_client_sdk/native_client_sdk_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698