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

Unified Diff: gyp/common_conditions.gypi

Issue 171233015: Fix NaCl build for pepper_32 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
« no previous file with comments | « no previous file | platform_tools/nacl/nacl_make » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 48f8e19d033e07e740b03382908699b0657ea517..3fa697e6e29c2d7f7f5825406962ef298383cd65 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -264,6 +264,9 @@
'defines': [
'SK_BUILD_FOR_NACL',
],
+ 'variables': {
+ 'nacl_sdk_root': '<!(["echo", "${NACL_SDK_ROOT}"])',
+ },
'link_settings': {
'libraries': [
'-lppapi',
@@ -271,6 +274,10 @@
'-lnosys',
'-pthread',
],
+ 'ldflags': [
+ '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release',
+ '-L<(nacl_sdk_root)/ports/lib/newlib_x86_<(skia_arch_width)/Release',
+ ],
},
}, { # skia_os != "nacl"
'link_settings': {
« no previous file with comments | « no previous file | platform_tools/nacl/nacl_make » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698