| 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//mojo/public/mojo.gni") | 6 import("//mojo/public/mojo.gni") |
| 7 import("//mojo/public/mojo_application.gni") | 7 import("//mojo/public/mojo_application.gni") |
| 8 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 9 import("//mojo/tools/embed/rules.gni") | 9 import("//mojo/tools/embed/rules.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 ] | 119 ] |
| 120 deps = [ | 120 deps = [ |
| 121 ":mojo_shell_child", | 121 ":mojo_shell_child", |
| 122 ] | 122 ] |
| 123 } | 123 } |
| 124 } | 124 } |
| 125 | 125 |
| 126 group("mojo_shell_child_32_bit") { | 126 group("mojo_shell_child_32_bit") { |
| 127 # This group is required to run any 32-bit child process. | 127 # This group is required to run any 32-bit child process. |
| 128 deps = [] | 128 deps = [] |
| 129 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux) { | 129 if ((target_cpu == "x64" || target_cpu == "x86") && is_linux && !is_fnl) { |
| 130 # The toolchain is hardcoded as 32-bit clang here -- although it must | 130 # The toolchain is hardcoded as 32-bit clang here -- although it must |
| 131 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would | 131 # be 32 bit (for nonsfi), it assumes clang. Ideally, the toolchain would |
| 132 # be defined as the 32 bit variant of whatever is being used (be it clang, | 132 # be defined as the 32 bit variant of whatever is being used (be it clang, |
| 133 # gcc, or something else). | 133 # gcc, or something else). |
| 134 deps = [ | 134 deps = [ |
| 135 ":mojo_shell_child_32_bit_copy(//build/toolchain/linux:clang_x86)", | 135 ":mojo_shell_child_32_bit_copy(//build/toolchain/linux:clang_x86)", |
| 136 ] | 136 ] |
| 137 } | 137 } |
| 138 } | 138 } |
| 139 } # !mojo_use_prebuilt_mojo_shell | 139 } # !mojo_use_prebuilt_mojo_shell |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 "${root_out_dir}/libmojo_shell.so", | 642 "${root_out_dir}/libmojo_shell.so", |
| 643 ] | 643 ] |
| 644 } else { | 644 } else { |
| 645 sources += [ "${root_out_dir}/mojo_shell" ] | 645 sources += [ "${root_out_dir}/mojo_shell" ] |
| 646 } | 646 } |
| 647 | 647 |
| 648 outputs = [ | 648 outputs = [ |
| 649 "${root_out_dir}/symbols/{{source_file_part}}", | 649 "${root_out_dir}/symbols/{{source_file_part}}", |
| 650 ] | 650 ] |
| 651 } | 651 } |
| OLD | NEW |