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

Unified Diff: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp

Issue 1681413002: Build the browser IRT shim with nacl-clang instead of biased bitcode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
index 3230ae260e5ce06bd6f6112a6ba12d93f95959a2..7d704ee9416409108a7b19248edc312bdd566812 100644
--- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
+++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
@@ -62,14 +62,14 @@
'<(pnacl_output_prefix)x86_64_pnacl_llc_nexe',
],
'inputs': [
- '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a',
- '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a',
+ '>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a',
+ '>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a',
],
'variables': {
'lib_overrides': [
# Use the two freshly generated shims.
- '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
- '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
+ '--lib_override=ia32,>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
+ '--lib_override=x64,>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
],
},
}],
@@ -86,12 +86,12 @@
'<(pnacl_output_prefix)arm_pnacl_llc_nexe',
],
'inputs': [
- '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim_browser.a',
+ '>(tc_lib_dir_newlib_arm)/libpnacl_irt_shim_browser.a',
],
'variables': {
'lib_overrides': [
# Use the freshly generated shim.
- '--lib_override=arm,>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
+ '--lib_override=arm,>(tc_lib_dir_newlib_arm)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
],
},
}],
@@ -105,12 +105,12 @@
'<(pnacl_output_prefix)mips32_pnacl_llc_nexe',
],
'inputs': [
- '>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim_browser.a',
+ '>(tc_lib_dir_newlib_mips)/libpnacl_irt_shim_browser.a',
],
'variables': {
'lib_overrides': [
# Use the freshly generated shim.
- '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
+ '--lib_override=mipsel,>(tc_lib_dir_newlib_mips)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
],
},
}],
@@ -124,12 +124,12 @@
'<(pnacl_output_prefix)x86_32_pnacl_llc_nexe',
],
'inputs': [
- '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a',
+ '>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a',
],
'variables': {
'lib_overrides': [
# Use the freshly generated shim.
- '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
+ '--lib_override=ia32,>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
],
},
}],
@@ -143,12 +143,12 @@
'<(pnacl_output_prefix)x86_64_pnacl_llc_nexe',
],
'inputs': [
- '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a',
+ '>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a',
],
'variables': {
'lib_overrides': [
# Use the freshly generated shim.
- '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
+ '--lib_override=x64,>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a',
],
},
}],

Powered by Google App Engine
This is Rietveld 408576698