summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authormymax@amazon.com <mymax@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-04 05:54:46 +0000
committermymax@amazon.com <mymax@amazon.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-04 05:54:46 +0000
commit376e0f5603f62b29b3625e766b309b78a1b94de6 (patch)
tree6af22bddb6eef56dadbb8e3105e9fb867d152441 /third_party
parent3a458684b53920e859297c7c3c8d834a6a760e97 (diff)
downloadchromium_src-376e0f5603f62b29b3625e766b309b78a1b94de6.zip
chromium_src-376e0f5603f62b29b3625e766b309b78a1b94de6.tar.gz
chromium_src-376e0f5603f62b29b3625e766b309b78a1b94de6.tar.bz2
Removing -include flag hack from compiler
This CL depends on https://codereview.chromium.org/18570002/ BUG=238755 R=kbr@chromium.org, senorblanco@chromium.org, marcheu@chromium.org, Review URL: https://chromiumcodereview.appspot.com/18125009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/mesa/README.chromium3
-rw-r--r--third_party/mesa/mesa.gyp3
2 files changed, 3 insertions, 3 deletions
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index f0931a3..3ba4bb0 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -29,3 +29,6 @@ Modifications made:
- Added typedefs for EGLNative*Type in eglplatform.h, guarded by an
__APPLE__ define
+
+- Added an #include for <assert.h> at the top of
+ src/gallium/auxiliary/util/u_debug.h
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 955bc80..da76a4e 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -51,9 +51,6 @@
'defines': [
'__GLIBC__',
],
- 'cflags': [
- '-include assert.h',
- ],
}],
['OS=="linux"', {
'defines': [