Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 { | 5 { |
| 6 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'nacl_target': 0, | 8 'nacl_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 'third_party/wtl/include', | 40 'third_party/wtl/include', |
| 41 ], | 41 ], |
| 42 },], | 42 },], |
| 43 ], | 43 ], |
| 44 }], | 44 }], |
| 45 ], | 45 ], |
| 46 }, | 46 }, |
| 47 'targets': [ | 47 'targets': [ |
| 48 { | 48 { |
| 49 'target_name': 'nacl', | 49 'target_name': 'nacl', |
| 50 'type': '<(library)', | 50 # The TLS (Thread Local Storage) access used by NaCl on x86-64 |
| 51 # on Linux/ELF can't be linked into a shared library, so we | |
| 52 # can't use '<(library)' here. See http://crbug.com/35829. | |
| 53 'type': 'static_library', | |
| 51 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C', | 54 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C', |
| 52 'variables': { | 55 'variables': { |
| 53 'nacl_target': 1, | 56 'nacl_target': 1, |
| 54 }, | 57 }, |
| 55 'dependencies': [ | 58 'dependencies': [ |
| 56 # TODO(gregoryd): chrome_resources and chrome_strings could be | 59 # TODO(gregoryd): chrome_resources and chrome_strings could be |
| 57 # shared with the 64-bit target, but it does not work due to a gyp | 60 # shared with the 64-bit target, but it does not work due to a gyp |
| 58 #issue | 61 #issue |
| 59 'chrome_resources', | 62 'chrome_resources', |
| 60 'chrome_strings', | 63 'chrome_strings', |
| 61 'common', | 64 'common', |
| 62 '../third_party/npapi/npapi.gyp:npapi', | 65 '../third_party/npapi/npapi.gyp:npapi', |
| 63 '../webkit/webkit.gyp:glue', | 66 '../webkit/webkit.gyp:glue', |
| 64 '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome ', | 67 '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome ', |
| 65 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', | 68 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', |
| 66 '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate ', | 69 '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate ', |
|
Evan Martin
2010/02/23 11:03:18
Are all of these dependencies marked as static lib
| |
| 67 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat form_qual_lib', | 70 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:plat form_qual_lib', |
| 68 ], | 71 ], |
| 69 }, | 72 }, |
| 70 ], | 73 ], |
| 71 'conditions': [ | 74 'conditions': [ |
| 72 ['OS=="win"', { | 75 ['OS=="win"', { |
| 73 'targets': [ | 76 'targets': [ |
| 74 { | 77 { |
| 75 'target_name': 'nacl_win64', | 78 'target_name': 'nacl_win64', |
| 76 'type': '<(library)', | 79 'type': '<(library)', |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 96 'configurations': { | 99 'configurations': { |
| 97 'Common_Base': { | 100 'Common_Base': { |
| 98 'msvs_target_platform': 'x64', | 101 'msvs_target_platform': 'x64', |
| 99 }, | 102 }, |
| 100 }, | 103 }, |
| 101 }, | 104 }, |
| 102 ], | 105 ], |
| 103 }], | 106 }], |
| 104 ], | 107 ], |
| 105 } | 108 } |
| OLD | NEW |