Remove android_webview_build conditions from various places.

Remove various minor android_webview_build references now that we no longer support that build configuration. BUG=440793 Review URL: https://codereview.chromium.org/1048863002 Cr-Commit-Position: refs/heads/master@{#324078}
marcosholgado · Apr 7, 2015 · fe8398d · fe8398d
1 parent 36b9038
commit fe8398d
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 32 deletions.
diff --git a/media/BUILD.gn b/media/BUILD.gn
@@ -345,12 +345,10 @@ component("media") {
     ]
     deps += [
       "//media/base/android",
+      "//media/base/android:media_java",
       "//media/base/android:media_jni_headers",
       "//media/base/android:video_capture_jni_headers",
     ]
-    if (!is_android_webview_build) {
-      deps += [ "//media/base/android:media_java" ]
-    }
   }
 
   if (current_cpu != "arm" && is_chromeos) {

diff --git a/media/media.gyp b/media/media.gyp
@@ -713,6 +713,7 @@
         ['OS=="android"', {
           'dependencies': [
             'media_android_jni_headers',
+            'media_java',
             'player_android',
             'video_capture_android_jni_headers',
           ],
@@ -727,13 +728,6 @@
             'renderers/default_renderer_factory.cc',
             'renderers/default_renderer_factory.h',
           ],
-          'conditions': [
-            ['android_webview_build==0', {
-              'dependencies': [
-                'media_java',
-              ],
-            }],
-          ],
           'defines': [
             'DISABLE_USER_INPUT_MONITOR',
           ],

diff --git a/net/BUILD.gn b/net/BUILD.gn
@@ -507,10 +507,7 @@ component("net") {
       "base/platform_mime_util_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
-
-    if (!is_android_webview_build) {
-      deps += [ ":net_jni_headers" ]
-    }
+    deps += [ ":net_jni_headers" ]
   }
 
   if (use_icu_alternatives_on_android) {

diff --git a/net/net_common.gypi b/net/net_common.gypi
@@ -368,7 +368,7 @@
         ],
       },
     ],
-    ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
+    ['OS=="android" and _toolset=="target"', {
       'dependencies': [
          'net_java',
       ],

diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi
@@ -104,13 +104,6 @@
         'SK_ARM_HAS_OPTIONAL_NEON',
       ],
     }],
-
-    # Enable feedback-directed optimisation for skia when building in android.
-    [ 'android_webview_build == 1', {
-      'aosp_build_settings': {
-        'LOCAL_FDO_SUPPORT': 'true',
-      },
-    }],
   ],
 
   'variables': {

diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
@@ -164,12 +164,6 @@
                 '-Wno-pointer-to-int-cast',
               ],
             }],
-            # Enable feedback-directed optimisation for sqlite when building in android.
-            ['android_webview_build == 1', {
-              'aosp_build_settings': {
-                'LOCAL_FDO_SUPPORT': 'true',
-              },
-            }],
           ],
         }],
       ],

diff --git a/tools/imagediff/image_diff.gyp b/tools/imagediff/image_diff.gyp
@@ -25,14 +25,11 @@
         'image_diff_png.cc',
       ],
       'conditions': [
-       ['OS=="android" and android_webview_build==0', {
+       ['OS=="android"', {
          # The Chromium Android port will compare images on host rather
          # than target (a device or emulator) for performance reasons.
          'toolsets': ['host'],
        }],
-       ['OS=="android" and android_webview_build==1', {
-         'type': 'none',
-       }],
       ],
     },
   ],