summaryrefslogtreecommitdiff
path: root/ppapi/ppapi_nacl.gyp
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-05-14 12:12:37 +0100
committerTorne (Richard Coles) <torne@google.com>2014-05-14 12:12:37 +0100
commit010d83a9304c5a91596085d917d248abff47903a (patch)
tree41ef1a01862f352f9653c7a9cfa817abefe2cce2 /ppapi/ppapi_nacl.gyp
parent08c107de54178bb0990a09adec724924e8bc9486 (diff)
downloadchromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py. Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'ppapi/ppapi_nacl.gyp')
-rw-r--r--ppapi/ppapi_nacl.gyp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/ppapi_nacl.gyp b/ppapi/ppapi_nacl.gyp
index 3f31f57173..18537802a5 100644
--- a/ppapi/ppapi_nacl.gyp
+++ b/ppapi/ppapi_nacl.gyp
@@ -186,7 +186,7 @@
},
# Shim is a dependency for the nexe because we pre-translate.
'dependencies': [
- '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_aot',
+ '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
],
'actions': [
{
@@ -221,7 +221,7 @@
},
# Shim is a dependency for the nexe because we pre-translate.
'dependencies': [
- '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_aot',
+ '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
],
'actions': [
{
@@ -245,7 +245,7 @@
},
# Shim is a dependency for the nexe because we pre-translate.
'dependencies': [
- '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_aot',
+ '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:shim_aot',
],
'actions': [
{