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

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

Issue 1239703003: Revert of Enable proguarding the WebView APK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | no next file » | 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 'shared_resources': 1,
20 'extensions_to_not_compress': '.lpak,.pak,.bin,.dat', 20 'extensions_to_not_compress': '.lpak,.pak,.bin,.dat',
21 'asset_location': '<(INTERMEDIATE_DIR)/assets/', 21 'asset_location': '<(INTERMEDIATE_DIR)/assets/',
22 'snapshot_copy_files': '<(snapshot_copy_files)', 22 'snapshot_copy_files': '<(snapshot_copy_files)',
23 'jinja_inputs': ['<(android_manifest_template_path)'], 23 'jinja_inputs': ['<(android_manifest_template_path)'],
24 'jinja_output': '<(INTERMEDIATE_DIR)/AndroidManifest.xml', 24 'jinja_output': '<(INTERMEDIATE_DIR)/AndroidManifest.xml',
25 'jinja_variables': [ '<@(android_manifest_template_vars)' ], 25 'jinja_variables': [ '<@(android_manifest_template_vars)' ],
26 'android_manifest_template_vars': [ ], 26 'android_manifest_template_vars': [ ],
27 'android_manifest_template_path': '<(DEPTH)/android_webview/apk/java/Android Manifest.xml', 27 'android_manifest_template_path': '<(DEPTH)/android_webview/apk/java/Android Manifest.xml',
28 'android_manifest_path': '<(jinja_output)', 28 'android_manifest_path': '<(jinja_output)',
29 'proguard_enabled': 'true', 29 # TODO: crbug.com/442348 Update proguard.flags and re-enable.
30 'proguard_enabled': 'false',
30 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'] , 31 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'] ,
31 # TODO: crbug.com/405035 Find a better solution for WebView .pak files. 32 # TODO: crbug.com/405035 Find a better solution for WebView .pak files.
32 'additional_input_paths': [ 33 'additional_input_paths': [
33 '<(asset_location)/webviewchromium.pak', 34 '<(asset_location)/webviewchromium.pak',
34 '<(asset_location)/webview_licenses.notice', 35 '<(asset_location)/webview_licenses.notice',
35 '<@(snapshot_additional_input_paths)', 36 '<@(snapshot_additional_input_paths)',
36 ], 37 ],
37 'includes': [ 38 'includes': [
38 '../snapshot_copying.gypi', 39 '../snapshot_copying.gypi',
39 ], 40 ],
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 '<(asset_location)/webview_licenses.notice', 80 '<(asset_location)/webview_licenses.notice',
80 ], 81 ],
81 'message': 'Generating WebView license notice', 82 'message': 'Generating WebView license notice',
82 }, 83 },
83 ], 84 ],
84 'includes': [ 85 'includes': [
85 '../../build/java_apk.gypi', 86 '../../build/java_apk.gypi',
86 '../../build/android/jinja_template.gypi', 87 '../../build/android/jinja_template.gypi',
87 ], 88 ],
88 } 89 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698