| Index: android_webview/android_webview.gyp
|
| diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
|
| index ff73e59e7c43c7aaa8e4ead0559b02f2854a2bff..4f115f0242c9797c718969a931f3452aa9cdd057 100644
|
| --- a/android_webview/android_webview.gyp
|
| +++ b/android_webview/android_webview.gyp
|
| @@ -33,12 +33,12 @@
|
| '../content/content.gyp:screen_orientation_values_java',
|
| '../content/content.gyp:speech_recognition_error_java',
|
| '../media/media.gyp:media_android_imageformat_list',
|
| - '../net/net.gyp:certificate_mime_types_java',
|
| '../net/net.gyp:cert_verify_status_android_java',
|
| + '../net/net.gyp:certificate_mime_types_java',
|
| '../net/net.gyp:net_errors_java',
|
| '../net/net.gyp:private_key_types_java',
|
| - '../ui/android/ui_android.gyp:window_open_disposition_java',
|
| '../ui/android/ui_android.gyp:bitmap_format_java',
|
| + '../ui/android/ui_android.gyp:window_open_disposition_java',
|
| ],
|
| }],
|
| [ 'android_webview_build==1 and use_system_skia==0', {
|
| @@ -251,6 +251,18 @@
|
| 'includes': [ '../build/java.gypi' ],
|
| },
|
| ],
|
| + }, { # android_webview_build==1
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'android_webview_strings',
|
| + 'type': 'none',
|
| + 'android_unmangled_name': 1,
|
| + 'dependencies': [
|
| + '../content/content.gyp:content_strings_grd',
|
| + '../ui/android/ui_android.gyp:ui_strings_grd',
|
| + ],
|
| + },
|
| + ],
|
| }],
|
| ],
|
| }
|
|
|