summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorphosek <phosek@chromium.org>2015-08-28 03:14:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-28 10:15:30 +0000
commit0a0211835326532c8280a2c187c9993cb2b0fa59 (patch)
treefa975962a0aee237ad7b53ab67b3cbd399178471 /ppapi
parent13c341a15d70751583937a2608ae82525010f7b3 (diff)
downloadchromium_src-0a0211835326532c8280a2c187c9993cb2b0fa59.zip
chromium_src-0a0211835326532c8280a2c187c9993cb2b0fa59.tar.gz
chromium_src-0a0211835326532c8280a2c187c9993cb2b0fa59.tar.bz2
Fix NaCl IRT build with GN
The current IRT target produces a NEXE with an incorrect name and location (different from what is hardcoded in the plugin). This change copies the built NEXE into the correct location. BUG=462791 Review URL: https://codereview.chromium.org/1313733010 Cr-Commit-Position: refs/heads/master@{#346114}
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/BUILD.gn30
1 files changed, 29 insertions, 1 deletions
diff --git a/ppapi/native_client/BUILD.gn b/ppapi/native_client/BUILD.gn
index 488f44f..008b0c9 100644
--- a/ppapi/native_client/BUILD.gn
+++ b/ppapi/native_client/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/config/features.gni")
-if (enable_nacl && enable_nacl_untrusted) {
+if (is_nacl) {
group("ppapi_lib") {
deps = [
"//native_client/src/untrusted/pthread",
@@ -34,4 +34,32 @@ if (enable_nacl && enable_nacl_untrusted) {
"//ppapi/shared_impl",
]
}
+
+ copy("nacl_irt_copy") {
+ # TODO(phosek): We can remove this ugliness if we change the
+ # IRT file name in components/nacl/browser/nacl_browser.cc
+ if (target_cpu == "x86") {
+ suffix = "x86_32"
+ } else if (target_cpu == "x64") {
+ suffix = "x86_64"
+ } else if (target_cpu == "arm") {
+ suffix = "arm"
+ }
+
+ sources = [
+ "${root_out_dir}/nacl_irt.nexe",
+ ]
+ outputs = [
+ "${root_build_dir}/{{source_name_part}}_${suffix}.nexe",
+ ]
+ deps = [
+ ":nacl_irt",
+ ]
+ }
+}
+
+group("irt") {
+ deps = [
+ ":nacl_irt_copy(//native_client/build/toolchain/nacl:irt_${target_cpu})",
+ ]
}