| 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 '../mojo/mojo_nacl.gypi', | 10 '../mojo/mojo_nacl.gypi', |
| 11 '../third_party/mojo/mojo_variables.gypi', | 11 '../third_party/mojo/mojo_variables.gypi', |
| 12 ], | 12 ], |
| 13 'targets': [ | 13 'targets': [ |
| 14 { | 14 { |
| 15 'target_name': 'libmojo', | 15 'target_name': 'libmojo', |
| 16 'type': 'none', | 16 'type': 'none', |
| 17 'variables': { | 17 'variables': { |
| 18 'nlib_target': 'libmojo.a', | 18 'nlib_target': 'libmojo.a', |
| 19 'build_glibc': 0, | 19 'build_glibc': 0, |
| 20 'build_newlib': 0, | 20 'build_newlib': 0, |
| 21 'build_pnacl_newlib': 1, | 21 'build_pnacl_newlib': 1, |
| 22 }, | 22 }, |
| 23 'sources': [ | 23 'sources': [ |
| 24 '<(monacl_codegen_dir)/libmojo.cc', | 24 '<(monacl_codegen_dir)/libmojo.cc', |
| 25 ], | 25 ], |
| 26 'dependencies': [ | 26 'dependencies': [ |
| 27 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
| 28 'mojo_nacl.gyp:monacl_codegen', | 27 'mojo_nacl.gyp:monacl_codegen', |
| 29 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', | 28 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', |
| 30 ], | 29 ], |
| 31 }, | 30 }, |
| 32 { | 31 { |
| 33 'target_name': 'libmojo_irt', | 32 'target_name': 'libmojo_irt', |
| 34 'type': 'none', | 33 'type': 'none', |
| 35 'variables': { | 34 'variables': { |
| 36 'nlib_target': 'libmojo_irt.a', | 35 'nlib_target': 'libmojo_irt.a', |
| 37 'build_glibc': 0, | 36 'build_glibc': 0, |
| 38 'build_newlib': 0, | 37 'build_newlib': 0, |
| 39 'build_pnacl_newlib': 0, | 38 'build_pnacl_newlib': 0, |
| 40 'build_irt': 1, | 39 'build_irt': 1, |
| 41 }, | 40 }, |
| 42 'sources': [ | 41 'sources': [ |
| 43 '<(monacl_codegen_dir)/mojo_irt.c', | 42 '<(monacl_codegen_dir)/mojo_irt.c', |
| 44 '<(monacl_codegen_dir)/mojo_irt.h', | 43 '<(monacl_codegen_dir)/mojo_irt.h', |
| 45 ], | 44 ], |
| 46 'dependencies': [ | 45 'dependencies': [ |
| 47 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
| 48 'mojo_nacl.gyp:monacl_codegen', | 46 'mojo_nacl.gyp:monacl_codegen', |
| 49 ], | 47 ], |
| 50 'direct_dependent_settings': { | 48 'direct_dependent_settings': { |
| 51 'include_dirs': [ | 49 'include_dirs': [ |
| 52 '../third_party/mojo/src', | 50 '../third_party/mojo/src', |
| 53 ], | 51 ], |
| 54 }, | 52 }, |
| 55 }, | 53 }, |
| 56 { | 54 { |
| 57 'target_name': 'monacl_test', | 55 'target_name': 'monacl_test', |
| 58 'type': 'none', | 56 'type': 'none', |
| 59 'variables': { | 57 'variables': { |
| 60 'nexe_target': 'monacl_test', | 58 'nexe_target': 'monacl_test', |
| 61 'build_newlib': 0, | 59 'build_newlib': 0, |
| 62 'build_pnacl_newlib': 1, | 60 'build_pnacl_newlib': 1, |
| 63 'translate_pexe_with_build': 1, | 61 'translate_pexe_with_build': 1, |
| 64 'link_flags': [ | 62 'link_flags': [ |
| 65 '-pthread', | 63 '-pthread', |
| 66 '-lmojo', | 64 '-lmojo', |
| 67 '-limc_syscalls', | 65 '-limc_syscalls', |
| 68 ], | 66 ], |
| 69 'sources': [ | 67 'sources': [ |
| 70 '<@(mojo_public_system_unittest_sources)', | 68 '<@(mojo_public_system_unittest_sources)', |
| 71 ], | 69 ], |
| 72 }, | 70 }, |
| 73 'dependencies': [ | 71 'dependencies': [ |
| 74 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
| 75 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', | 72 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', |
| 76 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib
', | 73 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib
', |
| 77 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li
b', | 74 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li
b', |
| 78 '../testing/gtest_nacl.gyp:gtest_nacl', | 75 '../testing/gtest_nacl.gyp:gtest_nacl', |
| 79 '../testing/gtest_nacl.gyp:gtest_main_nacl', | 76 '../testing/gtest_nacl.gyp:gtest_main_nacl', |
| 80 'libmojo', | 77 'libmojo', |
| 81 'mojo_nacl.gyp:monacl_codegen', | 78 'mojo_nacl.gyp:monacl_codegen', |
| 82 ], | 79 ], |
| 83 }, | 80 }, |
| 84 ], | 81 ], |
| 85 }], | 82 }], |
| 86 ], | 83 ], |
| 87 } | 84 } |
| OLD | NEW |