| 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 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'nacl/nacl_defines.gypi', | 10 'nacl/nacl_defines.gypi', |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se
l_main_chrome', | 83 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se
l_main_chrome', |
| 84 ], | 84 ], |
| 85 'conditions': [ | 85 'conditions': [ |
| 86 ['disable_nacl_untrusted==0', { | 86 ['disable_nacl_untrusted==0', { |
| 87 'dependencies': [ | 87 'dependencies': [ |
| 88 '../ppapi/native_client/native_client.gyp:nacl_irt', | 88 '../ppapi/native_client/native_client.gyp:nacl_irt', |
| 89 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s
him.gyp:pnacl_irt_shim', | 89 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s
him.gyp:pnacl_irt_shim', |
| 90 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pn
acl_support_extension.gyp:pnacl_support_extension', | 90 '../ppapi/native_client/src/untrusted/pnacl_support_extension/pn
acl_support_extension.gyp:pnacl_support_extension', |
| 91 ], | 91 ], |
| 92 }], | 92 }], |
| 93 ['target_arch=="mipsel"', { |
| 94 'dependencies!': [ |
| 95 '../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_s
him.gyp:pnacl_irt_shim', |
| 96 ], |
| 97 }], |
| 93 ], | 98 ], |
| 94 'direct_dependent_settings': { | 99 'direct_dependent_settings': { |
| 95 'defines': [ | 100 'defines': [ |
| 96 '<@(nacl_defines)', | 101 '<@(nacl_defines)', |
| 97 ], | 102 ], |
| 98 }, | 103 }, |
| 99 }, | 104 }, |
| 100 { | 105 { |
| 101 'target_name': 'nacl_browser', | 106 'target_name': 'nacl_browser', |
| 102 'type': 'static_library', | 107 'type': 'static_library', |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 'nacl/common/nacl_types.h', | 391 'nacl/common/nacl_types.h', |
| 387 'nacl/common/pnacl_types.cc', | 392 'nacl/common/pnacl_types.cc', |
| 388 'nacl/common/pnacl_types.h', | 393 'nacl/common/pnacl_types.h', |
| 389 ], | 394 ], |
| 390 'include_dirs': [ | 395 'include_dirs': [ |
| 391 '..', | 396 '..', |
| 392 ], | 397 ], |
| 393 }, | 398 }, |
| 394 ] | 399 ] |
| 395 } | 400 } |
| OLD | NEW |