diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 22:54:53 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-22 22:54:53 +0000 |
| commit | e76aa33cfb6ea9365d3a19bdcf12961afa79f59e (patch) | |
| tree | b43aa2663ba6347924fea5010d1ff8900740623d /ppapi | |
| parent | a94c5aadf3f07959901a9f9c4b26d76316ad7bae (diff) | |
| download | chromium_src-e76aa33cfb6ea9365d3a19bdcf12961afa79f59e.zip chromium_src-e76aa33cfb6ea9365d3a19bdcf12961afa79f59e.tar.gz chromium_src-e76aa33cfb6ea9365d3a19bdcf12961afa79f59e.tar.bz2 | |
Rename ppapi_ipc_proxy_untrusted to ppapi_proxy_untrusted.
This used to collide with the SRPC proxy gyp file, causing problems with xcode.
BUG=169152
TEST=builds
Review URL: https://chromiumcodereview.appspot.com/12033024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_proxy_untrusted.gyp (renamed from ppapi/ppapi_ipc_proxy_untrusted.gyp) | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index 83b5f252..8547cf3 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -290,7 +290,7 @@ ], }, 'dependencies': [ - '../ppapi_ipc_proxy_untrusted.gyp:ppapi_proxy_untrusted', + '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted', '../ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', '../../gpu/command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted', diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp index a5d3f88..a33fa0c 100644 --- a/ppapi/ppapi_ipc_proxy_untrusted.gyp +++ b/ppapi/ppapi_proxy_untrusted.gyp @@ -2,11 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# This file is named ppapi_ipc_proxy_untrusted.gyp instead of -# ppapi_proxy_untrusted.gyp, because there is already a file with that name in -# ppapi/native_client/src/shared/ppapi_proxy. This causes problems on Mac when -# generating for XCode. TODO(dmichael): This file should probably be renamed to -# ppapi_proxy_untrusted.gyp when we remove the SRPC NaCl proxy. { 'variables': { 'chromium_code': 1, |