Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Side by Side Diff: services/nacl/BUILD.gn

Issue 1413683003: Expose MGL interface through NaCl IRT (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Review feedback addressed Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/public/platform/native/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/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 = [
27 "//mojo/nacl/sfi/nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${targe t_cpu})",
28 ]
27 } 29 }
28 30
29 if (current_cpu == "x86" || current_cpu == "arm") { 31 if (current_cpu == "x86" || current_cpu == "arm") {
30 # Non-SFI NaCl can only be executed by a 32-bit process, so our 32 # 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. 33 # content handler must be built and launched as a 32-bit process as well.
32 mojo_native_application("nacl_content_handler_nonsfi_32_bit") { 34 mojo_native_application("nacl_content_handler_nonsfi_32_bit") {
33 sources = [ 35 sources = [
34 "content_handler_main_nonsfi.cc", 36 "content_handler_main_nonsfi.cc",
35 ] 37 ]
36 38
37 deps = [ 39 deps = [
38 "//base", 40 "//base",
39 "//mojo/application:application", 41 "//mojo/application:application",
40 "//mojo/application:content_handler", 42 "//mojo/application:content_handler",
41 "//mojo/data_pipe_utils", 43 "//mojo/data_pipe_utils",
44 "//mojo/public/platform/native:mgl_thunks",
45 "//mojo/public/platform/native:mgl_onscreen_thunks",
42 "//mojo/message_pump", 46 "//mojo/message_pump",
43 "//mojo/nacl/nonsfi:irt_mojo_nonsfi", 47 "//mojo/nacl/nonsfi:irt_mojo_nonsfi",
44 "//mojo/public/cpp/application:application", 48 "//mojo/public/cpp/application:application",
45 "//native_client/src/nonsfi/loader:elf_loader", 49 "//native_client/src/nonsfi/loader:elf_loader",
46 ] 50 ]
47 } 51 }
48 52
49 # Copy to the root build directory so that the '#!' prefix line for invoking 53 # Copy to the root build directory so that the '#!' prefix line for invoking
50 # our content handler can simply be "mojo:nacl_content_handler_nonsfi". 54 # our content handler can simply be "mojo:nacl_content_handler_nonsfi".
51 copy("nacl_content_handler_nonsfi_copy") { 55 copy("nacl_content_handler_nonsfi_copy") {
(...skipping 17 matching lines...) Expand all
69 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { 73 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) {
70 # The toolchain is hardcoded as 32-bit clang here -- although it must 74 # 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 75 # 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, 76 # be defined as the 32 bit variant of whatever is being used (be it clang,
73 # gcc, or something else). 77 # gcc, or something else).
74 deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x 86)" ] 78 deps += [ ":nacl_content_handler_nonsfi_copy(//build/toolchain/linux:clang_x 86)" ]
75 } else { 79 } else {
76 deps += [ ":nacl_content_handler_nonsfi_copy" ] 80 deps += [ ":nacl_content_handler_nonsfi_copy" ]
77 } 81 }
78 } 82 }
OLDNEW
« no previous file with comments | « mojo/public/platform/native/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698