diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 01:01:52 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 01:01:52 +0000 |
| commit | 3b74078cab0e4fbc8379f18bc5096b7a5de9f6b4 (patch) | |
| tree | d2a8183a7ca19961a9c63136b25629579c6f88f5 /ppapi/ppapi_untrusted.gyp | |
| parent | 2f6949c5e9bae0f46fd7123190515153662f5be8 (diff) | |
| download | chromium_src-3b74078cab0e4fbc8379f18bc5096b7a5de9f6b4.zip chromium_src-3b74078cab0e4fbc8379f18bc5096b7a5de9f6b4.tar.gz chromium_src-3b74078cab0e4fbc8379f18bc5096b7a5de9f6b4.tar.bz2 | |
Modifying ppapi_untrusted to match new gyp expectations.
default_defines is no longer set in untrusted.gypi
Using normal define merging instead.
R=bbudge@chromium.org
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10825145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_untrusted.gyp')
| -rw-r--r-- | ppapi/ppapi_untrusted.gyp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp index 8dd46ab..2fbdb7b 100644 --- a/ppapi/ppapi_untrusted.gyp +++ b/ppapi/ppapi_untrusted.gyp @@ -36,12 +36,16 @@ 'ppapi_cpp_lib', 'native_client/native_client.gyp:ppapi_lib', 'native_client/native_client.gyp:nacl_irt', - ], + ], 'variables': { - 'defines': [ - '<@(default_defines)', - '-DGL_GLEXT_PROTOTYPES', - ], + # TODO(bradnelson): Remove this compile flag once new nacl_rev is + # above 9362. + 'compile_flags': [ + '-DGL_GLEXT_PROTOTYPES', + ], + 'defines': [ + 'GL_GLEXT_PROTOTYPES', + ], 'nexe_target': 'ppapi_nacl_tests', 'build_newlib': 1, 'include_dirs': [ |