From fe424101036c75548967f952213d041eb7ffca83 Mon Sep 17 00:00:00 2001
From: "commit-bot@chromium.org"
 <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Fri, 21 Feb 2014 00:40:16 +0000
Subject: Fix NaCl build for pepper_32

BUG=skia:
R=rmistry@google.com, djsollen@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/171233015

git-svn-id: http://skia.googlecode.com/svn/trunk@13523 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 gyp/common_conditions.gypi    | 7 +++++++
 platform_tools/nacl/nacl_make | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 48f8e19d03..3fa697e6e2 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': {
diff --git a/platform_tools/nacl/nacl_make b/platform_tools/nacl/nacl_make
index 74b85718d6..97a1e9ed64 100755
--- a/platform_tools/nacl/nacl_make
+++ b/platform_tools/nacl/nacl_make
@@ -64,8 +64,9 @@ function setenv {
   exportVar AR "${NACLAR}"
   exportVar RANLIB "${NACLRANLIB}"
   exportVar PATH ${NACL_BIN_PATH}:${PATH};
-
-  exportVar GYP_DEFINES "skia_os=nacl skia_arch_width=${ARCH_WIDTH}"
+  exportVar C_INCLUDE_PATH "${NACL_SDK_ROOT}/include:${NACL_SDK_ROOT}/ports/include:${C_INCLUDE_PATH}"
+  exportVar CPLUS_INCLUDE_PATH "${NACL_SDK_ROOT}/include:${NACL_SDK_ROOT}/ports/include:${CPLUS_INCLUDE_PATH}"
+  exportVar GYP_DEFINES "skia_os=nacl skia_gpu=0 skia_arch_width=${ARCH_WIDTH}"
 }
 
 function build {
-- 
cgit v1.2.3