summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi.gyp
diff options
context:
space:
mode:
authornoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-12 00:24:40 +0000
committernoelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-12 00:24:40 +0000
commit7d36c295404f4d57607fea402cd1809568f72082 (patch)
treed950890d24e622dbd02ee26a5f29e129d63a959b /ppapi/ppapi.gyp
parent05f75566c6d87d434aaf5a98d3c1511f61599f44 (diff)
downloadchromium_src-7d36c295404f4d57607fea402cd1809568f72082.zip
chromium_src-7d36c295404f4d57607fea402cd1809568f72082.tar.gz
chromium_src-7d36c295404f4d57607fea402cd1809568f72082.tar.bz2
Enable untrusted GYP builds in Chrome (irt via gyp)
Reconstruct of CL to enable untrsuted builds see: http://codereview.chromium.org/8416025. This CL will enable untrusted builds in Chrome. The first step is to enable enable building the IRT via this technique instead of using scons. DEPS: We bump NaCl deps to fix untrusted.gypi in NaCl Repo ppapi/ppapi_cpp.gypi+ Add ppapi_cpp library for NEXE ppapi/native_client/native_client.gyp Add ppapi library for NEXE (copy linker script to toolchain dir) Add nacl_irt target (the actual IRT.NEXE) ppapi/ppapi.gyp & ppapi/ppapi_internal.gyp Pull in untrusted.gypi from NaCl repo ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp Add ppruntime library for NEXE chrome/nacl.gypi Remove scons header scan and scons irt build Add dependency to untrusted IRT build in native_client.gyp BUG= http://code.google.com/p/chromium/issues/detail?id=96782 TEST= try TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/8502036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi.gyp')
-rw-r--r--ppapi/ppapi.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index f1eb48f..7adbf5a 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -28,6 +28,7 @@
],
},
'includes': [
+ '../native_client/build/untrusted.gypi',
'ppapi_cpp.gypi',
'ppapi_gl.gypi',
],