Chromium Code Reviews| 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 'includes': [ | 6 'includes': [ |
| 7 '../../../build/common.gypi', | 7 '../../../build/common.gypi', |
| 8 ], | 8 ], |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 37 'build_irt': 0, | 37 'build_irt': 0, |
| 38 'build_pnacl_newlib': 0, | 38 'build_pnacl_newlib': 0, |
| 39 'build_nonsfi_helper': 1, | 39 'build_nonsfi_helper': 1, |
| 40 'conditions': [ | 40 'conditions': [ |
| 41 ['target_arch=="ia32" or target_arch=="x64"', { | 41 ['target_arch=="ia32" or target_arch=="x64"', { |
| 42 'extra_deps_newlib32_nonsfi': [ | 42 'extra_deps_newlib32_nonsfi': [ |
| 43 '>(tc_lib_dir_nonsfi_helper32)/libgio.a', | 43 '>(tc_lib_dir_nonsfi_helper32)/libgio.a', |
| 44 '>(tc_lib_dir_nonsfi_helper32)/libplatform.a', | 44 '>(tc_lib_dir_nonsfi_helper32)/libplatform.a', |
| 45 ], | 45 ], |
| 46 }], | 46 }], |
| 47 ['target_arch=="arm"', { | |
| 48 'extra_deps_newlib_arm_nonsfi': [ | |
|
Mark Seaborn
2014/12/15 03:16:32
Will similar changes be needed on the Chromium sid
mazda
2014/12/17 17:11:27
Yes, similar changes like the following are needed
| |
| 49 '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a', | |
| 50 '>(tc_lib_dir_nonsfi_helper_arm)/libplatform.a', | |
| 51 ], | |
| 52 }], | |
| 47 ], | 53 ], |
| 48 }, | 54 }, |
| 49 'sources': [ | 55 'sources': [ |
| 50 'elf_loader_main.c', | 56 'elf_loader_main.c', |
| 51 ], | 57 ], |
| 52 'link_flags': [ | 58 'link_flags': [ |
| 53 '-lelf_loader', | 59 '-lelf_loader', |
| 54 '-lplatform', | 60 '-lplatform', |
| 55 '-lgio', | 61 '-lgio', |
| 56 ], | 62 ], |
| 57 'dependencies': [ | 63 'dependencies': [ |
| 58 'elf_loader', | 64 'elf_loader', |
| 59 '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private', | 65 '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private', |
| 60 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', | 66 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', |
| 61 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 67 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 62 ], | 68 ], |
| 63 }, | 69 }, |
| 64 ], | 70 ], |
| 65 } | 71 } |
| OLD | NEW |