Fix use_system_stlport on Android

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 950 matching lines @@
         'android_unit_test_target_type%': 'static_library',
 
         'conditions': [
           # Choose static link by build type.
           ['android_build_type==0', {
             'static_link_system_icu%': 1,
           }, {
             'static_link_system_icu%': 0,
           }],
         ],
-        # TODO(steveblock): Investigate using the system versions of sqlite,
-        # libjpeg and stlport.
+        # TODO(steveblock): Investigate using the system versions of sqlite and
+        # libjpeg.
         # Enable to use system sqlite.
         'use_system_sqlite%': 0,  # '<(android_build_type)',
         # Enable to use system libjpeg.
         'use_system_libjpeg%': 0,  # '<(android_build_type)',
         # Enable to use the system expat.
         'use_system_expat%': '<(android_build_type)',
         # Enable to use the system stlport, otherwise statically
         # link the NDK one?
-        'use_system_stlport%': 0,  # '<(android_build_type)',
+        'use_system_stlport%': '<(android_build_type)',
         # Copy it out one scope.
         'android_build_type%': '<(android_build_type)',
       }],  # OS=="android"
       ['OS=="mac"', {
         # Enable clang on mac by default!
         'clang%': 1,
         # Compile in Breakpad support by default so that it can be
         # tested, even if it is not enabled by default at runtime.
         'mac_breakpad_compiled_in%': 1,
         'conditions': [
@@ skipping 1563 matching lines @@
                   # Enable identical code folding to reduce size.
                   '-Wl,--icf=safe',
                 ],
               }],
               # NOTE: The stlport header include paths below are specified in
               # cflags rather than include_dirs because they need to come
               # after include_dirs. Think of them like system headers, but
               # don't use '-isystem' because the arm-linux-androideabi-4.4.3
               # toolchain (circa Gingerbread) will exhibit strange errors.
               # The include ordering here is important; change with caution.
-              ['use_system_stlport==0', {
+              ['use_system_stlport==1', {
+                'cflags': [
+                  # For libstdc++/include, which is used by stlport.
+                  '-I<(android_src)/bionic',
+                  '-I<(android_src)/external/stlport/stlport',
+                ],
+              }, { # else: use_system_stlport!=1
                 'cflags': [
                   '-I<(android_ndk_root)/sources/cxx-stl/stlport/stlport',
                 ],
                 'conditions': [
                   ['target_arch=="arm" and armv7==1', {
                     'ldflags': [
                       '-L<(android_ndk_root)/sources/cxx-stl/stlport/libs/armeabi-v7a',
                     ],
                   }],
                   ['target_arch=="arm" and armv7==0', {
@@ skipping 710 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }