Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'enable_bare_metal_nacl': 0, | |
|
Mark Seaborn
2013/12/06 03:21:16
If we're going to test Bare Metal Mode on the Chro
hidehiko
2013/12/06 17:40:02
Done.
| |
| 8 }, | 9 }, |
| 9 'includes': [ | 10 'includes': [ |
| 10 'nacl/nacl_defines.gypi', | 11 'nacl/nacl_defines.gypi', |
| 11 ], | 12 ], |
| 12 'target_defaults': { | 13 'target_defaults': { |
| 13 'variables': { | 14 'variables': { |
| 14 'nacl_target': 0, | 15 'nacl_target': 0, |
| 15 }, | 16 }, |
| 16 'target_conditions': [ | 17 'target_conditions': [ |
| 17 # This part is shared between the targets defined below. Only files and | 18 # This part is shared between the targets defined below. Only files and |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 205 }], | 206 }], |
| 206 ['os_posix == 1 and OS != "mac"', { | 207 ['os_posix == 1 and OS != "mac"', { |
| 207 'conditions': [ | 208 'conditions': [ |
| 208 ['linux_use_tcmalloc==1', { | 209 ['linux_use_tcmalloc==1', { |
| 209 'dependencies': [ | 210 'dependencies': [ |
| 210 '../base/allocator/allocator.gyp:allocator', | 211 '../base/allocator/allocator.gyp:allocator', |
| 211 ], | 212 ], |
| 212 }], | 213 }], |
| 213 ], | 214 ], |
| 214 }], | 215 }], |
| 216 ['enable_bare_metal_nacl == 1', { | |
|
Mark Seaborn
2013/12/06 03:21:16
So this should just be 'os_linux==1' instead.
hidehiko
2013/12/06 17:40:02
Done. Note that OS == linux is checked by enclosin
| |
| 217 'sources': [ | |
| 218 # Bare Metal Mode is currently experimental and available | |
| 219 # only for linux environment. | |
| 220 'nacl/loader/bare_metal/bare_metal_error_code.h', | |
|
Mark Seaborn
2013/12/06 03:21:16
On naming: I was thinking about calling this "nons
hidehiko
2013/12/06 17:40:02
Indeed. Done. Renamed all Bare Metal to Non SFI.
| |
| 221 'nacl/loader/bare_metal/bare_metal_main.c', | |
| 222 'nacl/loader/bare_metal/bare_metal_main.h', | |
| 223 'nacl/loader/bare_metal/elf_util.c', | |
| 224 'nacl/loader/bare_metal/elf_util.h', | |
| 225 ], | |
| 226 }] | |
| 215 ], | 227 ], |
| 216 'cflags': ['-fPIE'], | 228 'cflags': ['-fPIE'], |
| 217 'link_settings': { | 229 'link_settings': { |
| 218 'ldflags': ['-pie'], | 230 'ldflags': ['-pie'], |
| 219 }, | 231 }, |
| 220 }, | 232 }, |
| 221 ], | 233 ], |
| 222 }], | 234 }], |
| 223 ['OS=="win" and target_arch=="ia32"', { | 235 ['OS=="win" and target_arch=="ia32"', { |
| 224 'targets': [ | 236 'targets': [ |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 358 'nacl/common/nacl_types.h', | 370 'nacl/common/nacl_types.h', |
| 359 'nacl/common/pnacl_types.cc', | 371 'nacl/common/pnacl_types.cc', |
| 360 'nacl/common/pnacl_types.h', | 372 'nacl/common/pnacl_types.h', |
| 361 ], | 373 ], |
| 362 'include_dirs': [ | 374 'include_dirs': [ |
| 363 '..', | 375 '..', |
| 364 ], | 376 ], |
| 365 }, | 377 }, |
| 366 ] | 378 ] |
| 367 } | 379 } |
| OLD | NEW |