| 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 'variables': { | 8 'variables': { |
| 9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui
ld/inverse_depth.py <(DEPTH))/monacl', | 9 'monacl_codegen_dir': '<(SHARED_INTERMEDIATE_DIR)/<!(python <(DEPTH)/bui
ld/inverse_depth.py <(DEPTH))/monacl', |
| 10 }, | 10 }, |
| 11 'includes': [ | 11 'includes': [ |
| 12 'mojo_variables.gypi', | |
| 13 '../build/common_untrusted.gypi', | 12 '../build/common_untrusted.gypi', |
| 14 '../components/nacl/nacl_defines.gypi', | 13 '../components/nacl/nacl_defines.gypi', |
| 14 '../third_party/mojo/mojo_variables.gypi', |
| 15 ], | 15 ], |
| 16 'targets': [ | 16 'targets': [ |
| 17 { | 17 { |
| 18 'target_name': 'libmojo', | 18 'target_name': 'libmojo', |
| 19 'type': 'none', | 19 'type': 'none', |
| 20 'variables': { | 20 'variables': { |
| 21 'nlib_target': 'libmojo.a', | 21 'nlib_target': 'libmojo.a', |
| 22 'build_glibc': 0, | 22 'build_glibc': 0, |
| 23 'build_newlib': 0, | 23 'build_newlib': 0, |
| 24 'build_pnacl_newlib': 1, | 24 'build_pnacl_newlib': 1, |
| 25 }, | 25 }, |
| 26 'defines': [ | 26 'defines': [ |
| 27 '<@(nacl_defines)', | 27 '<@(nacl_defines)', |
| 28 ], | 28 ], |
| 29 'sources': [ | 29 'sources': [ |
| 30 '<(monacl_codegen_dir)/libmojo.cc', | 30 '<(monacl_codegen_dir)/libmojo.cc', |
| 31 ], | 31 ], |
| 32 'dependencies': [ | 32 'dependencies': [ |
| 33 'mojo_nacl.gyp:monacl_codegen', | 33 'mojo_nacl.gyp:monacl_codegen', |
| 34 'mojo_public.gyp:mojo_system_placeholder', | 34 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', |
| 35 ], | 35 ], |
| 36 }, | 36 }, |
| 37 { | 37 { |
| 38 'target_name': 'monacl_test', | 38 'target_name': 'monacl_test', |
| 39 'type': 'none', | 39 'type': 'none', |
| 40 'variables': { | 40 'variables': { |
| 41 'nexe_target': 'monacl_test', | 41 'nexe_target': 'monacl_test', |
| 42 'build_newlib': 0, | 42 'build_newlib': 0, |
| 43 'build_pnacl_newlib': 1, | 43 'build_pnacl_newlib': 1, |
| 44 'translate_pexe_with_build': 1, | 44 'translate_pexe_with_build': 1, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 59 '../testing/gtest_nacl.gyp:gtest_nacl', | 59 '../testing/gtest_nacl.gyp:gtest_nacl', |
| 60 '../testing/gtest_nacl.gyp:gtest_main_nacl', | 60 '../testing/gtest_nacl.gyp:gtest_main_nacl', |
| 61 'libmojo', | 61 'libmojo', |
| 62 'mojo_nacl.gyp:monacl_codegen', | 62 'mojo_nacl.gyp:monacl_codegen', |
| 63 ], | 63 ], |
| 64 }, | 64 }, |
| 65 ], | 65 ], |
| 66 }], | 66 }], |
| 67 ], | 67 ], |
| 68 } | 68 } |
| OLD | NEW |