Remove android_webview_build conditions.

build/toolchain.gypi

Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index f1f46c89c71830a0d27e8c72bc80db26b849269e..ed2616bbdb92b302a9074275c50acd0f01cf05a8 100644
--- a/build/toolchain.gypi
+++ b/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',
-                 },
-               }],
              ]
            }],
          ],