[WebView] Fix automerger breakage.
Ensure that the android_webview_locales_rename_paks
action is not executed when building downstream.
Review URL: https://codereview.chromium.org/881623003
Cr-Commit-Position: refs/heads/master@{#315046}
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 8de8138d..10f98b8 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -30,26 +30,32 @@
},
'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)',
- ],
- }
+ }],
],
},
{
@@ -136,6 +142,7 @@
'../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': [
@@ -276,11 +283,6 @@
'renderer/print_render_frame_observer.cc',
'renderer/print_render_frame_observer.h',
],
- 'conditions': [
- ['android_webview_build==0', {
- 'dependencies': [ 'android_webview_pak', ],
- }],
- ],
},
{
'target_name': 'libwebviewchromium',
