Remove android_webview_build conditions.

Remove references to android_webview_build now that we no longer support
that build configuration. This also removes use_system_stlport which was
only supported with android_webview_build.

BUG=chromium:440793
LOG=n

Review URL: https://codereview.chromium.org/1069663002

Cr-Commit-Position: refs/heads/master@{#27708}

build/android.gypi

@@ -69,9 +69,6 @@
         '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': {
@@ -108,6 +105,7 @@
           # 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.
@@ -127,6 +125,8 @@
         'ldflags': [
           '-nostdlib',
           '-Wl,--no-undefined',
+          '-Wl,-rpath-link=<(android_lib)',
+          '-L<(android_lib)',
         ],
         'libraries!': [
             '-lrt',  # librt is built into Bionic.
@@ -146,12 +146,6 @@
             '-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.
@@ -164,19 +158,6 @@
               '-mtune=cortex-a8',
               '-mfpu=vfp3',
             ],
-          }],
-          # 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)',
-            ],
-            'conditions': [
-              ['target_arch=="arm" and arm_version==7', {
             'ldflags': [
               '-L<(android_stlport_libs)/armeabi-v7a',
             ],
@@ -186,16 +167,6 @@
               '-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',
@@ -206,8 +177,6 @@
               '-L<(android_stlport_libs)/arm64-v8a',
             ],
           }],
-            ],
-          }],
           ['target_arch=="ia32" or target_arch=="x87"', {
             # The x86 toolchain currently has problems with stack-protector.
             'cflags!': [
@@ -216,6 +185,9 @@
             'cflags': [
               '-fno-stack-protector',
             ],
+            'ldflags': [
+              '-L<(android_stlport_libs)/x86',
+            ],
           }],
           ['target_arch=="mipsel"', {
             # The mips toolchain currently has problems with stack-protector.
@@ -226,6 +198,9 @@
             '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': [

build/toolchain.gypi

@@ -131,14 +131,6 @@
 
     # Link-Time Optimizations
     'use_lto%': 0,
-
-    'variables': {
-      # This is set when building the Android WebView inside the Android build
-      # system, using the 'android' gyp backend.
-      'android_webview_build%': 0,
-    },
-    # Copy it out one scope.
-    'android_webview_build%': '<(android_webview_build)',
   },
   'conditions': [
     ['host_arch=="ia32" or host_arch=="x64" or \
@@ -203,7 +195,7 @@
         'target_conditions': [
           ['_toolset=="host"', {
             'conditions': [
-              ['v8_target_arch==host_arch and android_webview_build==0', {
+              ['v8_target_arch==host_arch', {
                 # Host built with an Arm CXX compiler.
                 'conditions': [
                   [ 'arm_version==7', {
@@ -246,7 +238,7 @@
           }],  # _toolset=="host"
           ['_toolset=="target"', {
             'conditions': [
-              ['v8_target_arch==target_arch and android_webview_build==0', {
+              ['v8_target_arch==target_arch', {
                 # Target built with an Arm CXX compiler.
                 'conditions': [
                   [ 'arm_version==7', {
@@ -370,7 +362,7 @@
         'target_conditions': [
           ['_toolset=="target"', {
             'conditions': [
-              ['v8_target_arch==target_arch and android_webview_build==0', {
+              ['v8_target_arch==target_arch', {
                 # Target built with a Mips CXX compiler.
                 'cflags': [
                   '-EB',
@@ -557,7 +549,7 @@
         'target_conditions': [
           ['_toolset=="target"', {
             'conditions': [
-              ['v8_target_arch==target_arch and android_webview_build==0', {
+              ['v8_target_arch==target_arch', {
                 # Target built with a Mips CXX compiler.
                 'cflags': [
                   '-EL',
@@ -761,7 +753,7 @@
         'target_conditions': [
           ['_toolset=="target"', {
             'conditions': [
-              ['v8_target_arch==target_arch and android_webview_build==0', {
+              ['v8_target_arch==target_arch', {
                 'cflags': [
                   '-EL',
                   '-Wno-error=array-bounds',  # Workaround https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56273
@@ -929,12 +921,6 @@
                 'cflags': [ '-m32' ],
                 'ldflags': [ '-m32' ],
               }],
-              # Enable feedback-directed optimisation when building in android.
-              [ 'android_webview_build == 1', {
-                'aosp_build_settings': {
-                  'LOCAL_FDO_SUPPORT': 'true',
-                },
-              }],
             ],
             'xcode_settings': {
               'ARCHS': [ 'i386' ],
@@ -960,12 +946,6 @@
                  'cflags': [ '-m64' ],
                  'ldflags': [ '-m64' ],
                }],
-               # Enable feedback-directed optimisation when building in android.
-               [ 'android_webview_build == 1', {
-                 'aosp_build_settings': {
-                   'LOCAL_FDO_SUPPORT': 'true',
-                 },
-               }],
              ]
            }],
          ],