Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: third_party/mesa/mesa.gyp

Issue 951983002: Reland "Enable libc++ on Android" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang+mesa Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/net_util_linux.cc ('k') | third_party/re2/patches/re2-libcxx.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/mesa.gyp
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 82027b35e7e0bc636997c98ca4267f5151737f9a..58c25d2ecf62df85c1766855045d83a925ef662b 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -46,13 +46,7 @@
"_GLAPI_NO_EXPORTS",
],
'conditions': [
- ['OS=="android"', {
- 'defines': [
- '__GLIBC__',
- '_GNU_SOURCE',
- ],
- }],
- ['OS=="linux"', {
+ ['OS=="android" or OS=="linux"', {
'defines': [
'_GNU_SOURCE',
],
« no previous file with comments | « net/base/net_util_linux.cc ('k') | third_party/re2/patches/re2-libcxx.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698