| Index: android_webview/android_webview.gyp
|
| diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
|
| index 8de8138d38e0c25dd3f328c932a49fe148eb9d1b..10f98b83c9c339628588429b7a441632b96ac5b7 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))'
|
| - ],
|
| - '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)',
|
| + ],
|
| + '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)',
|
| + ],
|
| + }
|
| ],
|
| - }
|
| + }],
|
| ],
|
| },
|
| {
|
| @@ -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',
|
|
|