Remove android_webview_build conditions.

build/android.gypi

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 51 matching lines @@
           ['target_arch=="x64"', {
             'android_lib': '<(android_sysroot)/usr/lib64',
           }, {
             'android_lib': '<(android_sysroot)/usr/lib',
           }],
         ],
         'android_stlport_include': '<(android_stlport)/stlport',
         'android_stlport_libs': '<(android_stlport)/libs',
       }],
     ],
-    # Enable to use the system stlport, otherwise statically
-    # link the NDK one?
-    'use_system_stlport%': '<(android_webview_build)',
     'android_stlport_library': 'stlport_static',
   },  # variables
   'target_defaults': {
     'defines': [
       'ANDROID',
       'V8_ANDROID_LOG_STDOUT',
     ],
     'configurations': {
       'Release': {
         'cflags': [
@@ skipping 16 matching lines @@
         'cflags': [
           '-ffunction-sections',
           '-funwind-tables',
           '-fstack-protector',
           '-fno-short-enums',
           '-finline-limit=64',
           '-Wa,--noexecstack',
           # Note: This include is in cflags to ensure that it comes after
           # all of the includes.
           '-I<(android_include)',
+          '-I<(android_stlport_include)',
         ],
         'cflags_cc': [
           '-Wno-error=non-virtual-dtor',  # TODO(michaelbai): Fix warnings.
         ],
         'defines': [
           'ANDROID',
           #'__GNU_SOURCE=1',  # Necessary for clone()
           'USE_STLPORT=1',
           '_STLP_USE_PTR_SPECIALIZATIONS=1',
           'HAVE_OFF64_T',
           'HAVE_SYS_UIO_H',
           'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize.
         ],
         'ldflags!': [
           '-pthread',  # Not supported by Android toolchain.
         ],
         'ldflags': [
           '-nostdlib',
           '-Wl,--no-undefined',
+          '-Wl,-rpath-link=<(android_lib)',
+          '-L<(android_lib)',
         ],
         'libraries!': [
             '-lrt',  # librt is built into Bionic.
             # Not supported by Android toolchain.
             # Where do these come from?  Can't find references in
             # any Chromium gyp or gypi file.  Maybe they come from
             # gyp itself?
             '-lpthread', '-lnss3', '-lnssutil3', '-lsmime3', '-lplds4', '-lplc4', '-lnspr4',
           ],
           'libraries': [
             '-l<(android_stlport_library)',
             # Manually link the libgcc.a that the cross compiler uses.
             '<!($CC -print-libgcc-file-name)',
             '-lc',
             '-ldl',
             '-lstdc++',
             '-lm',
         ],
         'conditions': [
-          ['android_webview_build==0', {
-            'ldflags': [
-              '-Wl,-rpath-link=<(android_lib)',
-              '-L<(android_lib)',
-            ],
-          }],
           ['target_arch == "arm"', {
             'ldflags': [
               # Enable identical code folding to reduce size.
               '-Wl,--icf=safe',
             ],
           }],
           ['target_arch=="arm" and arm_version==7', {
             'cflags': [
               '-march=armv7-a',
               '-mtune=cortex-a8',
               '-mfpu=vfp3',
             ],
+            'ldflags': [
+              '-L<(android_stlport_libs)/armeabi-v7a',
+            ],
           }],
-          # 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', {
-            'cflags': [
-              '-I<(android_stlport_include)',
+          ['target_arch=="arm" and arm_version < 7', {
+            'ldflags': [
+              '-L<(android_stlport_libs)/armeabi',
             ],
-            'conditions': [
-              ['target_arch=="arm" and arm_version==7', {
-                'ldflags': [
-                  '-L<(android_stlport_libs)/armeabi-v7a',
-                ],
-              }],
-              ['target_arch=="arm" and arm_version < 7', {
-                'ldflags': [
-                  '-L<(android_stlport_libs)/armeabi',
-                ],
-              }],
-              ['target_arch=="mipsel"', {
-                'ldflags': [
-                  '-L<(android_stlport_libs)/mips',
-                ],
-              }],
-              ['target_arch=="ia32" or target_arch=="x87"', {
-                'ldflags': [
-                  '-L<(android_stlport_libs)/x86',
-                ],
-              }],
-              ['target_arch=="x64"', {
-                'ldflags': [
-                  '-L<(android_stlport_libs)/x86_64',
-                ],
-              }],
-              ['target_arch=="arm64"', {
-                'ldflags': [
-                  '-L<(android_stlport_libs)/arm64-v8a',
-                ],
-              }],
+          }],
+          ['target_arch=="x64"', {
+            'ldflags': [
+              '-L<(android_stlport_libs)/x86_64',
+            ],
+          }],
+          ['target_arch=="arm64"', {
+            'ldflags': [
+              '-L<(android_stlport_libs)/arm64-v8a',
             ],
           }],
           ['target_arch=="ia32" or target_arch=="x87"', {
             # The x86 toolchain currently has problems with stack-protector.
             'cflags!': [
               '-fstack-protector',
             ],
             'cflags': [
               '-fno-stack-protector',
             ],
+            'ldflags': [
+              '-L<(android_stlport_libs)/x86',
+            ],
           }],
           ['target_arch=="mipsel"', {
             # The mips toolchain currently has problems with stack-protector.
             'cflags!': [
               '-fstack-protector',
               '-U__linux__'
             ],
             'cflags': [
               '-fno-stack-protector',
             ],
+            'ldflags': [
+              '-L<(android_stlport_libs)/mips',
+            ],
           }],
           ['(target_arch=="arm" or target_arch=="arm64" or target_arch=="x64") and component!="shared_library"', {
             'cflags': [
               '-fPIE',
             ],
             'ldflags': [
               '-pie',
             ],
           }],
         ],
@@ skipping 43 matching lines @@
         'ldflags!': [
           '-Wl,-z,noexecstack',
           '-Wl,--gc-sections',
           '-Wl,-O1',
           '-Wl,--as-needed',
         ],
       }],
     ],  # target_conditions
   },  # target_defaults
 }