summaryrefslogtreecommitdiffstats
path: root/android_webview/apk
diff options
context:
space:
mode:
authormkosiba <mkosiba@chromium.org>2014-12-15 10:55:34 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-15 18:56:04 +0000
commit40700e971f2fa39849df2316edadb9fb4ff6d0e1 (patch)
tree63a8725f7f3df434cc965592696a96cd20570885 /android_webview/apk
parent353779ec8f69d8666cac95bdf7c0a0ecbbbbee6b (diff)
downloadchromium_src-40700e971f2fa39849df2316edadb9fb4ff6d0e1.zip
chromium_src-40700e971f2fa39849df2316edadb9fb4ff6d0e1.tar.gz
chromium_src-40700e971f2fa39849df2316edadb9fb4ff6d0e1.tar.bz2
[android_webview] Disable proguard for SystemWebViewGoogle.
We were using a stale proguard config which meant that Release builds were completely broken. Turning proguard off till we fix this for real. BUG=442348 Review URL: https://codereview.chromium.org/808473003 Cr-Commit-Position: refs/heads/master@{#308380}
Diffstat (limited to 'android_webview/apk')
-rw-r--r--android_webview/apk/system_webview_apk_common.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi
index c8da225..0d19dac 100644
--- a/android_webview/apk/system_webview_apk_common.gypi
+++ b/android_webview/apk/system_webview_apk_common.gypi
@@ -18,7 +18,8 @@
'R_package_relpath': 'com/android/webview/chromium',
'extensions_to_not_compress': 'pak',
'asset_location': '<(PRODUCT_DIR)/android_webview_assets',
- 'proguard_enabled': 'true',
+ # TODO: crbug.com/442348 Update proguard.flags and re-enable.
+ 'proguard_enabled': 'false',
'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'],
# TODO: crbug.com/405035 Find a better solution for WebView .pak files.
'additional_input_paths': [