summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorlizeb <lizeb@chromium.org>2015-07-23 07:05:10 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-23 14:05:36 +0000
commitb5c3f8a04315769ad6253f2f4cebcaa250ab3ef0 (patch)
treeaf60b03c56686f9af13e7e4ec9ae8c345cb64f8b /android_webview
parentb3ce1150e9a521967273d53792e7a38a31b6dd4b (diff)
downloadchromium_src-b5c3f8a04315769ad6253f2f4cebcaa250ab3ef0.zip
chromium_src-b5c3f8a04315769ad6253f2f4cebcaa250ab3ef0.tar.gz
chromium_src-b5c3f8a04315769ad6253f2f4cebcaa250ab3ef0.tar.bz2
Fix Android release builds.
This commit tells proguard to ignore errors caused by the duplication (and inclusion) of ViewStructure (new class in M Preview, required in trunk). This is intended to fix the release builders. BUG=513229 TBR=sgurun Review URL: https://codereview.chromium.org/1253683002 Cr-Commit-Position: refs/heads/master@{#340085}
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/apk/java/proguard.flags4
1 files changed, 4 insertions, 0 deletions
diff --git a/android_webview/apk/java/proguard.flags b/android_webview/apk/java/proguard.flags
index a2fe0c2..fcb8589 100644
--- a/android_webview/apk/java/proguard.flags
+++ b/android_webview/apk/java/proguard.flags
@@ -87,3 +87,7 @@
public static **[] values();
public static ** valueOf(java.lang.String);
}
+
+# Remove when ViewStructure is no longer duplicated (crbug.com/513229)
+-dontwarn android.view.*
+-dontwarn android.webkit.*