Reland "Enable libc++ on Android"

third_party/mesa/mesa.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'generated_src_dir': 'src/chromium_gensrc',
   },
   'target_defaults': {
     'defines': [
@@ skipping 28 matching lines @@
       "GLX_INDIRECT_RENDERING",
       "GLX_DIRECT_RENDERING",
       "USE_EXTERNAL_DXTN_LIB=1",
       "IN_DRI_DRIVER",
       "HAVE_ALIAS",
       "HAVE_MINCORE",
       "HAVE_LIBUDEV",
       "_GLAPI_NO_EXPORTS",
     ],
     'conditions': [
-      ['OS=="android"', {
-        'defines': [
-          '__GLIBC__',
-          '_GNU_SOURCE',
-        ],
-      }],
-      ['OS=="linux"', {
+      ['OS=="android" or OS=="linux"', {
         'defines': [
           '_GNU_SOURCE',
         ],
       }],
       ['os_posix == 1', {
         'defines': [
           'HAVE_DLOPEN',
           'HAVE_PTHREAD=1',
           'HAVE_UNISTD_H=1',
         ],
@@ skipping 675 matching lines @@
                 '<(PRODUCT_DIR)/libosmesa.so',
                 '<(SHARED_LIB_DIR)/libosmesa.so',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }