| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'conditions': [ | 6 'conditions': [ |
| 7 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 7 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../build/common_untrusted.gypi', | 9 '../build/common_untrusted.gypi', |
| 10 '../components/nacl/nacl_defines.gypi', | |
| 11 '../mojo/mojo_nacl.gypi', | 10 '../mojo/mojo_nacl.gypi', |
| 12 '../third_party/mojo/mojo_variables.gypi', | 11 '../third_party/mojo/mojo_variables.gypi', |
| 13 ], | 12 ], |
| 14 'targets': [ | 13 'targets': [ |
| 15 { | 14 { |
| 16 'target_name': 'libmojo', | 15 'target_name': 'libmojo', |
| 17 'type': 'none', | 16 'type': 'none', |
| 18 'variables': { | 17 'variables': { |
| 19 'nlib_target': 'libmojo.a', | 18 'nlib_target': 'libmojo.a', |
| 20 'build_glibc': 0, | 19 'build_glibc': 0, |
| 21 'build_newlib': 0, | 20 'build_newlib': 0, |
| 22 'build_pnacl_newlib': 1, | 21 'build_pnacl_newlib': 1, |
| 23 }, | 22 }, |
| 24 'defines': [ | |
| 25 '<@(nacl_defines)', | |
| 26 ], | |
| 27 'sources': [ | 23 'sources': [ |
| 28 '<(monacl_codegen_dir)/libmojo.cc', | 24 '<(monacl_codegen_dir)/libmojo.cc', |
| 29 ], | 25 ], |
| 30 'dependencies': [ | 26 'dependencies': [ |
| 31 'mojo_nacl.gyp:monacl_codegen', | 27 'mojo_nacl.gyp:monacl_codegen', |
| 32 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', | 28 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', |
| 33 ], | 29 ], |
| 34 }, | 30 }, |
| 35 { | 31 { |
| 36 'target_name': 'monacl_test', | 32 'target_name': 'monacl_test', |
| (...skipping 20 matching lines...) Expand all Loading... |
| 57 '../testing/gtest_nacl.gyp:gtest_nacl', | 53 '../testing/gtest_nacl.gyp:gtest_nacl', |
| 58 '../testing/gtest_nacl.gyp:gtest_main_nacl', | 54 '../testing/gtest_nacl.gyp:gtest_main_nacl', |
| 59 'libmojo', | 55 'libmojo', |
| 60 'mojo_nacl.gyp:monacl_codegen', | 56 'mojo_nacl.gyp:monacl_codegen', |
| 61 ], | 57 ], |
| 62 }, | 58 }, |
| 63 ], | 59 ], |
| 64 }], | 60 }], |
| 65 ], | 61 ], |
| 66 } | 62 } |
| OLD | NEW |