| OLD | NEW |
|---|
| (Empty) |
| 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 | |
| 3 # found in the LICENSE file. | |
| 4 | |
| 5 { | |
| 6 'conditions': [ | |
| 7 ['disable_nacl==0 and disable_nacl_untrusted==0', { | |
| 8 'includes': [ | |
| 9 '../build/common_untrusted.gypi', | |
| 10 '../mojo/mojo_nacl.gypi', | |
| 11 '../third_party/mojo/mojo_variables.gypi', | |
| 12 ], | |
| 13 'targets': [ | |
| 14 { | |
| 15 'target_name': 'libmojo', | |
| 16 'type': 'none', | |
| 17 'variables': { | |
| 18 'nlib_target': 'libmojo.a', | |
| 19 'build_glibc': 0, | |
| 20 'build_newlib': 0, | |
| 21 'build_pnacl_newlib': 1, | |
| 22 }, | |
| 23 'sources': [ | |
| 24 '<(monacl_codegen_dir)/libmojo.cc', | |
| 25 ], | |
| 26 'dependencies': [ | |
| 27 'mojo_nacl.gyp:monacl_codegen', | |
| 28 '../third_party/mojo/mojo_public.gyp:mojo_system_placeholder', | |
| 29 ], | |
| 30 }, | |
| 31 { | |
| 32 'target_name': 'libmojo_irt', | |
| 33 'type': 'none', | |
| 34 'variables': { | |
| 35 'nlib_target': 'libmojo_irt.a', | |
| 36 'build_glibc': 0, | |
| 37 'build_newlib': 0, | |
| 38 'build_pnacl_newlib': 0, | |
| 39 'build_irt': 1, | |
| 40 }, | |
| 41 'sources': [ | |
| 42 '<(monacl_codegen_dir)/mojo_irt.c', | |
| 43 '<(monacl_codegen_dir)/mojo_irt.h', | |
| 44 ], | |
| 45 'dependencies': [ | |
| 46 'mojo_nacl.gyp:monacl_codegen', | |
| 47 ], | |
| 48 'direct_dependent_settings': { | |
| 49 'include_dirs': [ | |
| 50 '../third_party/mojo/src', | |
| 51 ], | |
| 52 }, | |
| 53 }, | |
| 54 { | |
| 55 'target_name': 'monacl_test', | |
| 56 'type': 'none', | |
| 57 'variables': { | |
| 58 'nexe_target': 'monacl_test', | |
| 59 'build_newlib': 0, | |
| 60 'build_pnacl_newlib': 1, | |
| 61 'translate_pexe_with_build': 1, | |
| 62 'link_flags': [ | |
| 63 '-pthread', | |
| 64 '-lmojo', | |
| 65 '-limc_syscalls', | |
| 66 ], | |
| 67 'sources': [ | |
| 68 '<@(mojo_public_system_unittest_sources)', | |
| 69 ], | |
| 70 }, | |
| 71 'dependencies': [ | |
| 72 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', | |
| 73 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib
', | |
| 74 '<(DEPTH)/native_client/src/untrusted/pthread/pthread.gyp:pthread_li
b', | |
| 75 '../testing/gtest_nacl.gyp:gtest_nacl', | |
| 76 '../testing/gtest_nacl.gyp:gtest_main_nacl', | |
| 77 'libmojo', | |
| 78 'mojo_nacl.gyp:monacl_codegen', | |
| 79 ], | |
| 80 }, | |
| 81 ], | |
| 82 }], | |
| 83 ], | |
| 84 } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1279133006:
Removed unused mojo_nacl code and GYP targets. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master