| Index: third_party/android_webview_glue/android_webview_glue.gypi
|
| diff --git a/third_party/android_webview_glue/android_webview_glue.gypi b/third_party/android_webview_glue/android_webview_glue.gypi
|
| index df80f70e5a2d6d851f051ba48a317cf909744695..3ba317a52fdd88fb7fc0d6dd800860051c4db44e 100644
|
| --- a/third_party/android_webview_glue/android_webview_glue.gypi
|
| +++ b/third_party/android_webview_glue/android_webview_glue.gypi
|
| @@ -5,38 +5,10 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'system_webview_apk',
|
| - 'type': 'none',
|
| - 'dependencies': [
|
| - 'libwebviewchromium',
|
| - 'android_webview_java',
|
| - 'android_webview_pak',
|
| - ],
|
| 'variables': {
|
| - 'android_sdk_jar': '../third_party/android_platform/webview/frameworks.jar',
|
| 'apk_name': 'SystemWebView',
|
| - 'app_manifest_version_code': '999999',
|
| - 'java_in_dir': 'src/chromium',
|
| - 'java_in_dir_suffix': '/java',
|
| - 'native_lib_target': 'libwebviewchromium',
|
| - 'never_lint': 1,
|
| - 'resource_dir': 'src/chromium/res',
|
| - 'R_package': 'com.android.webview.chromium',
|
| - 'R_package_relpath': 'com/android/webview/chromium',
|
| - 'extensions_to_not_compress': 'pak',
|
| - 'asset_location': '<(PRODUCT_DIR)/android_webview_assets',
|
| - # TODO: crbug.com/405035 Find a better solution for WebView .pak files.
|
| - 'additional_input_paths': [
|
| - '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
|
| - '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
|
| - ],
|
| - 'conditions': [
|
| - ['icu_use_data_file_flag==1', {
|
| - 'additional_input_paths': [
|
| - '<(PRODUCT_DIR)/icudtl.dat',
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| + 'includes': [ 'android_webview_glue_common.gypi' ],
|
| 'copies': [
|
| {
|
| 'destination': '<(PRODUCT_DIR)/android_webview_assets',
|
| @@ -49,7 +21,7 @@
|
| }],
|
| ],
|
| },
|
| - ],'includes': [ '../../build/java_apk.gypi' ],
|
| + ],
|
| },
|
| ],
|
| }
|
|
|