Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Side by Side Diff: android_webview/apk/system_webview_apk_common.gypi

Issue 1007443002: Update WebView's android framework jar to 5.1.0_r1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add minor gyp tidyup Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « android_webview/android_webview.gyp ('k') | third_party/android_platform/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 # 4 #
5 # When making changes remember that this is shared with the internal .apk 5 # When making changes remember that this is shared with the internal .apk
6 # build rules. 6 # build rules.
7 { 7 {
8 'type': 'none', 8 'type': 'none',
9 'dependencies': [ 9 'dependencies': [
10 '<(DEPTH)/android_webview/android_webview.gyp:libwebviewchromium', 10 '<(DEPTH)/android_webview/android_webview.gyp:libwebviewchromium',
11 '<(DEPTH)/android_webview/android_webview.gyp:android_webview_java', 11 '<(DEPTH)/android_webview/android_webview.gyp:android_webview_java',
12 '<(DEPTH)/android_webview/android_webview.gyp:android_webview_pak', 12 '<(DEPTH)/android_webview/android_webview.gyp:android_webview_pak',
13 ], 13 ],
14 'variables': { 14 'variables': {
15 'native_lib_target': 'libwebviewchromium', 15 'native_lib_target': 'libwebviewchromium',
16 'never_lint': 1, 16 'never_lint': 1,
17 'R_package': 'com.android.webview.chromium', 17 'R_package': 'com.android.webview.chromium',
18 'R_package_relpath': 'com/android/webview/chromium', 18 'R_package_relpath': 'com/android/webview/chromium',
19 'shared_resources': 1,
19 'extensions_to_not_compress': 'pak,bin,dat', 20 'extensions_to_not_compress': 'pak,bin,dat',
20 'asset_location': '<(INTERMEDIATE_DIR)/assets/', 21 'asset_location': '<(INTERMEDIATE_DIR)/assets/',
21 'snapshot_copy_files': '<(snapshot_copy_files)', 22 'snapshot_copy_files': '<(snapshot_copy_files)',
22 # TODO: crbug.com/442348 Update proguard.flags and re-enable. 23 # TODO: crbug.com/442348 Update proguard.flags and re-enable.
23 'proguard_enabled': 'false', 24 'proguard_enabled': 'false',
24 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'] , 25 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'] ,
25 # TODO: crbug.com/405035 Find a better solution for WebView .pak files. 26 # TODO: crbug.com/405035 Find a better solution for WebView .pak files.
26 'additional_input_paths': [ 27 'additional_input_paths': [
27 '<@(webview_locales_output_paks)', 28 '<@(webview_locales_output_paks)',
28 '<(asset_location)/webviewchromium.pak', 29 '<(asset_location)/webviewchromium.pak',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 '<(asset_location)/webview_licenses.notice', 76 '<(asset_location)/webview_licenses.notice',
76 ], 77 ],
77 'message': 'Generating WebView license notice', 78 'message': 'Generating WebView license notice',
78 }, 79 },
79 ], 80 ],
80 'includes': [ 81 'includes': [
81 'system_webview_locales_paks.gypi', 82 'system_webview_locales_paks.gypi',
82 '../../build/java_apk.gypi', 83 '../../build/java_apk.gypi',
83 ], 84 ],
84 } 85 }
OLDNEW
« no previous file with comments | « android_webview/android_webview.gyp ('k') | third_party/android_platform/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698