| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 # This file is for proguard flags which are applied to the combined test and | 5 # This file is for proguard flags which are applied to the combined test and |
| 6 # tested code. Do not put any flags in this file which might affect the | 6 # tested code. Do not put any flags in this file which might affect the |
| 7 # correctness of the .apk we are testing, since it will apply to that .apk as | 7 # correctness of the .apk we are testing, since it will apply to that .apk as |
| 8 # well. | 8 # well. |
| 9 | 9 |
| 10 # We want all tests to stick around. | 10 # We want all tests to stick around. |
| 11 -keep class * extends junit.framework.TestCase { | 11 -keep class * extends junit.framework.TestCase { |
| 12 *; | 12 *; |
| 13 } | 13 } |
| 14 | 14 |
| 15 # TODO(yfriedman): Remove when crbug.com/488192 is fixed. | 15 # TODO(yfriedman): Remove when crbug.com/488192 is fixed. |
| 16 -dontwarn org.apache.http.conn.scheme.LayeredSocketFactory | 16 -dontwarn org.apache.http.conn.scheme.LayeredSocketFactory |
| 17 | 17 |
| 18 # We have some "library class WebView depends on program class SslCertificate" | 18 # We have some "library class WebView depends on program class SslCertificate" |
| 19 # warnings, and they don't affect us. | 19 # warnings, and they don't affect us. |
| 20 -dontwarn android.webkit.WebView* | 20 -dontwarn android.webkit.WebView* |
| 21 | 21 |
| 22 # We don't want BasicHttpParams or AbstractHttpParams to get renamed since that | 22 # We don't want BasicHttpParams or AbstractHttpParams to get renamed since that |
| 23 # then makes our calls to them use the implementation that we find in our .dex | 23 # then makes our calls to them use the implementation that we find in our .dex |
| 24 # file, which is broken. We need to rely on these calls resolving to the | 24 # file, which is broken. We need to rely on these calls resolving to the |
| 25 # system's implementation. See crbug.com/488192#c36. | 25 # system's implementation. See crbug.com/488192#c36. |
| 26 -keep class org.apache.** { | 26 -keepnames class org.apache.** { |
| 27 *; | 27 *; |
| 28 } | 28 } |
| OLD | NEW |