[WebView] Fix automerger breakage.

android_webview/android_webview.gyp

 # Copyright 2009 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.
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'android_webview_pak',
@@ skipping 12 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
           },
          'includes': [ '../build/repack_action.gypi' ],
         },
-        {
-          'action_name': 'android_webview_locales_rename_paks',
-          'variables': {
-            'rename_locales': 'tools/webview_locales_rename_paks.py',
-          },
-          'inputs': [
-            '<(rename_locales)',
-            '<!@pymod_do_main(webview_locales_rename_paks -i -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+      ],
+      'conditions': [
+        ['android_webview_build==0', {
+          'actions': [
+            {
+              'action_name': 'android_webview_locales_rename_paks',
+              'variables': {
+                'rename_locales': 'tools/webview_locales_rename_paks.py',
+              },
+              'inputs': [
+                '<(rename_locales)',
+                '<!@pymod_do_main(webview_locales_rename_paks -i -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+              ],
+              'outputs': [
+                '<!@pymod_do_main(webview_locales_rename_paks -o -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+              ],
+              'action': [
+                'python',
+                '<(rename_locales)',
+                '-p', '<(PRODUCT_DIR)',
+                '-s', '<(SHARED_INTERMEDIATE_DIR)',
+                '<@(locales)',
+              ],
+            }
           ],
-          'outputs': [
-            '<!@pymod_do_main(webview_locales_rename_paks -o -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
-          ],
-          'action': [
-            'python',
-            '<(rename_locales)',
-            '-p', '<(PRODUCT_DIR)',
-            '-s', '<(SHARED_INTERMEDIATE_DIR)',
-            '<@(locales)',
-          ],
-        }
+        }],
       ],
     },
     {
       'target_name': 'android_webview_strings_grd',
       'android_unmangled_name': 1,
       'type': 'none',
       'variables': {
         'grd_file': '../android_webview/java/strings/android_webview_strings.grd',
       },
       'includes': [
@@ skipping 66 matching lines @@
         '../gpu/gpu.gyp:gles2_implementation',
         '../gpu/gpu.gyp:gl_in_process_context',
         '../media/media.gyp:media',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
         '../ui/gl/gl.gyp:gl',
         '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
+        'android_webview_pak',
         'android_webview_version',
       ],
       'include_dirs': [
         '..',
         '../skia/config',
         '<(SHARED_INTERMEDIATE_DIR)/ui/resources/',
       ],
       'sources': [
         'browser/aw_browser_context.cc',
         'browser/aw_browser_context.h',
@@ skipping 120 matching lines @@
         'renderer/aw_print_web_view_helper_delegate.h',
         'renderer/aw_render_process_observer.cc',
         'renderer/aw_render_process_observer.h',
         'renderer/aw_render_frame_ext.cc',
         'renderer/aw_render_frame_ext.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
         'renderer/print_render_frame_observer.cc',
         'renderer/print_render_frame_observer.h',
       ],
-      'conditions': [
-        ['android_webview_build==0', {
-          'dependencies': [ 'android_webview_pak', ],
-        }],
-      ],
     },
     {
       'target_name': 'libwebviewchromium',
       'includes': [
           'libwebviewchromium.gypi',
       ],
     }
   ],
   'conditions': [
     ['android_webview_build==0', {
@@ skipping 63 matching lines @@
             '../ui/android/ui_android.gyp:ui_strings_grd',
             'android_webview_jarjar_content_resources',
             'android_webview_jarjar_ui_resources',
             'android_webview_strings_grd',
           ],
         },
       ],
     }],
   ],
 }