| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 import("//mojo/public/mojo_application.gni") | 5 import("//mojo/public/mojo_application.gni") |
| 6 | 6 |
| 7 # Trusted code | 7 # Trusted code |
| 8 if (!is_nacl) { | 8 if (!is_nacl) { |
| 9 mojo_native_application("nacl_content_handler") { | 9 mojo_native_application("nacl_content_handler") { |
| 10 sources = [ | 10 sources = [ |
| 11 "content_handler_main.cc", | 11 "content_handler_main.cc", |
| 12 ] | 12 ] |
| 13 | 13 |
| 14 deps = [ | 14 deps = [ |
| 15 "//base", | 15 "//base", |
| 16 "//mojo/application:application", | 16 "//mojo/application:application", |
| 17 "//mojo/application:content_handler", | 17 "//mojo/application:content_handler", |
| 18 "//mojo/data_pipe_utils", | 18 "//mojo/data_pipe_utils", |
| 19 "//mojo/message_pump", | 19 "//mojo/message_pump", |
| 20 "//mojo/public/platform/native:system_impl_private", | 20 "//mojo/public/platform/native:system_impl_private", |
| 21 "//mojo/services/network/public/interfaces", | 21 "//mojo/services/network/interfaces", |
| 22 "//mojo/nacl/sfi/nacl_bindings:monacl_sel", | 22 "//mojo/nacl/sfi/nacl_bindings:monacl_sel", |
| 23 "//url", | 23 "//url", |
| 24 ] | 24 ] |
| 25 | 25 |
| 26 data_deps = [ "//mojo/nacl/sfi/nacl_bindings:irt_mojo(//build/toolchain/nacl
:irt_${target_cpu})" ] | 26 data_deps = [ "//mojo/nacl/sfi/nacl_bindings:irt_mojo(//build/toolchain/nacl
:irt_${target_cpu})" ] |
| 27 } | 27 } |
| 28 | 28 |
| 29 if (current_cpu == "x86" || current_cpu == "arm") { | 29 if (current_cpu == "x86" || current_cpu == "arm") { |
| 30 # Non-SFI NaCl can only be executed by a 32-bit process, so our | 30 # Non-SFI NaCl can only be executed by a 32-bit process, so our |
| 31 # content handler must be built and launched as a 32-bit process as well. | 31 # content handler must be built and launched as a 32-bit process as well. |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { | 69 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { |
| 70 # The toolchain is hardcoded as 32-bit clang here -- although it must | 70 # The toolchain is hardcoded as 32-bit clang here -- although it must |
| 71 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would | 71 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would |
| 72 # be defined as the 32 bit variant of whatever is being used (be it clang, | 72 # be defined as the 32 bit variant of whatever is being used (be it clang, |
| 73 # gcc, or something else). | 73 # gcc, or something else). |
| 74 deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x
86)" ] | 74 deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x
86)" ] |
| 75 } else { | 75 } else { |
| 76 deps += [ ":nacl_content_handler_nonsfi_copy" ] | 76 deps += [ ":nacl_content_handler_nonsfi_copy" ] |
| 77 } | 77 } |
| 78 } | 78 } |
| OLD | NEW |