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

Side by Side Diff: build/common.gypi

Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)
Patch Set: Created 11 years, 2 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/chrome_dll_main.cc » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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': { 9 'variables': {
10 # .gyp files should set chromium_code to 1 if they build Chromium-specific 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 # Set this to true to enable SELinux support. 148 # Set this to true to enable SELinux support.
149 'selinux%': 0, 149 'selinux%': 0,
150 150
151 # Strip the binary after dumping symbols. 151 # Strip the binary after dumping symbols.
152 'linux_strip_binary%': 0, 152 'linux_strip_binary%': 0,
153 153
154 # Set to select the Title Case versions of strings in GRD files. 154 # Set to select the Title Case versions of strings in GRD files.
155 'use_titlecase_in_grd_files%': 0, 155 'use_titlecase_in_grd_files%': 0,
156 156
157 # Used to disable Native Client at compile time, for platforms where it
158 # isn't supported
159 'disable_nacl%': 0,
160
157 'conditions': [ 161 'conditions': [
158 ['OS=="linux"', { 162 ['OS=="linux"', {
159 'conditions': [ 163 'conditions': [
160 ['branding=="Chrome" or linux_chromium_breakpad==1', { 164 ['branding=="Chrome" or linux_chromium_breakpad==1', {
161 'linux_breakpad%': 1, 165 'linux_breakpad%': 1,
162 }, { 166 }, {
163 'linux_breakpad%': 0, 167 'linux_breakpad%': 0,
164 }], 168 }],
165 # All Chrome builds have breakpad symbols, but only process the 169 # All Chrome builds have breakpad symbols, but only process the
166 # symbols from official builds. 170 # symbols from official builds.
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 ], 844 ],
841 }, { 845 }, {
842 'target_defaults': { 846 'target_defaults': {
843 # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the 847 # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the
844 # C99 macros on Mac and Linux. 848 # C99 macros on Mac and Linux.
845 'defines': [ 849 'defines': [
846 '__STDC_FORMAT_MACROS', 850 '__STDC_FORMAT_MACROS',
847 ], 851 ],
848 }, 852 },
849 }], 853 }],
854 ['disable_nacl==1', {
855 'target_defaults': {
856 'defines': [
857 'DISABLE_NACL',
858 ],
859 },
860 }],
850 ['msvs_use_common_linker_extras', { 861 ['msvs_use_common_linker_extras', {
851 'target_defaults': { 862 'target_defaults': {
852 'msvs_settings': { 863 'msvs_settings': {
853 'VCLinkerTool': { 864 'VCLinkerTool': {
854 'AdditionalOptions': 865 'AdditionalOptions':
855 '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat', 866 '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
856 'DelayLoadDLLs': [ 867 'DelayLoadDLLs': [
857 'dbghelp.dll', 868 'dbghelp.dll',
858 'dwmapi.dll', 869 'dwmapi.dll',
859 'uxtheme.dll', 870 'uxtheme.dll',
(...skipping 15 matching lines...) Expand all
875 # settings in target dicts. SYMROOT is a special case, because many other 886 # settings in target dicts. SYMROOT is a special case, because many other
876 # Xcode variables depend on it, including variables such as 887 # Xcode variables depend on it, including variables such as
877 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 888 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
878 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 889 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
879 # files to appear (when present) in the UI as actual files and not red 890 # files to appear (when present) in the UI as actual files and not red
880 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 891 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
881 # and therefore SYMROOT, needs to be set at the project level. 892 # and therefore SYMROOT, needs to be set at the project level.
882 'SYMROOT': '<(DEPTH)/xcodebuild', 893 'SYMROOT': '<(DEPTH)/xcodebuild',
883 }, 894 },
884 } 895 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698