| 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 = [ |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 mojo_native_application("nacl_content_handler_nonsfi_32_bit") { | 33 mojo_native_application("nacl_content_handler_nonsfi_32_bit") { |
| 34 sources = [ | 34 sources = [ |
| 35 "content_handler_main_nonsfi.cc", | 35 "content_handler_main_nonsfi.cc", |
| 36 ] | 36 ] |
| 37 | 37 |
| 38 deps = [ | 38 deps = [ |
| 39 "//base", | 39 "//base", |
| 40 "//mojo/application:application", | 40 "//mojo/application:application", |
| 41 "//mojo/application:content_handler", | 41 "//mojo/application:content_handler", |
| 42 "//mojo/data_pipe_utils", | 42 "//mojo/data_pipe_utils", |
| 43 "//mojo/public/platform/native:mgl_thunks", |
| 44 "//mojo/public/platform/native:mgl_onscreen_thunks", |
| 43 "//mojo/message_pump", | 45 "//mojo/message_pump", |
| 44 "//mojo/nacl:irt_mojo_nonsfi", | 46 "//mojo/nacl:irt_mojo_nonsfi", |
| 45 "//mojo/public/cpp/application:application", | 47 "//mojo/public/cpp/application:application", |
| 46 "//native_client/src/nonsfi/loader:elf_loader", | 48 "//native_client/src/nonsfi/loader:elf_loader", |
| 47 ] | 49 ] |
| 48 } | 50 } |
| 49 | 51 |
| 50 # Copy to the root build directory so that the '#!' prefix line for invoking | 52 # Copy to the root build directory so that the '#!' prefix line for invoking |
| 51 # our content handler can simply be "mojo:nacl_content_handler_nonsfi". | 53 # our content handler can simply be "mojo:nacl_content_handler_nonsfi". |
| 52 copy("nacl_content_handler_nonsfi_copy") { | 54 copy("nacl_content_handler_nonsfi_copy") { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 70 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { | 72 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { |
| 71 # The toolchain is hardcoded as 32-bit clang here -- although it must | 73 # The toolchain is hardcoded as 32-bit clang here -- although it must |
| 72 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would | 74 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would |
| 73 # be defined as the 32 bit variant of whatever is being used (be it clang, | 75 # be defined as the 32 bit variant of whatever is being used (be it clang, |
| 74 # gcc, or something else). | 76 # gcc, or something else). |
| 75 deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x
86)" ] | 77 deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x
86)" ] |
| 76 } else { | 78 } else { |
| 77 deps += [ ":nacl_content_handler_nonsfi_copy" ] | 79 deps += [ ":nacl_content_handler_nonsfi_copy" ] |
| 78 } | 80 } |
| 79 } | 81 } |
| OLD | NEW |