From c8a016c402bcc923349a3c840bcb196bcfc1425d Mon Sep 17 00:00:00 2001 From: Selim Gurun Date: Fri, 11 Mar 2016 16:40:55 -0800 Subject: [PATCH] Add proguard definitions to prevent stripping of methods Newly added WebviewChromium methods getHandler and findFocus were being stripped by proguard. Explicitly keep them in .jar. Review URL: https://codereview.chromium.org/1765333002 Cr-Commit-Position: refs/heads/master@{#379922} (cherry picked from commit 4e0e6528676be9ee35c31286c19f7bb9d4c7e957) BUG=594274 Review URL: https://codereview.chromium.org/1787733004 . Cr-Commit-Position: refs/branch-heads/2661@{#201} Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081} --- android_webview/apk/java/proguard.flags | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android_webview/apk/java/proguard.flags b/android_webview/apk/java/proguard.flags index d97b4c5820f8d..1840348979127 100644 --- a/android_webview/apk/java/proguard.flags +++ b/android_webview/apk/java/proguard.flags @@ -85,10 +85,14 @@ public static boolean dumpWithoutCrashing(...); } -#TODO(hush): remove after N release. crbug.com/543272, crbug.com/584789 +#TODO(hush): remove after N release. crbug.com/543272, crbug.com/584789. +#TODO(hush): Also remove getHandler and findFocus when removing others here +# and add @Override to these methods. -keep class com.android.webview.chromium.WebViewChromium { public void onActivityResult(int,int,android.content.Intent); public boolean onDragEvent(android.view.DragEvent); + public android.os.Handler getHandler(android.os.Handler); + public android.view.View findFocus(android.view.View); } #TODO(hush): remove after N release. crbug.com/546762