Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
index 965120aad0f6b62702286fbc868f46868dc6c976..5d3d668bafb603f1c478b33d0390533ef080514f 100644 |
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
@@ -322,18 +322,9 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { |
} |
private void setUpResources(Context context) { |
- try { |
- final String packageName = WebViewFactory.getLoadedPackageInfo().packageName; |
- ResourceRewriter.rewriteRValues( |
- mWebViewDelegate.getPackageId(context.getResources(), packageName)); |
- } catch (RuntimeException e) { |
- // TODO(torne): remove this when we're no longer using the Android build system. |
- // The Android.mk-based build uses a different resources package name than the |
- // ninja-based build: the resources are always called com.android.webview even if the |
- // manifest has had the package renamed. |
- ResourceRewriter.rewriteRValues( |
- mWebViewDelegate.getPackageId(context.getResources(), "com.android.webview")); |
- } |
+ final String packageName = WebViewFactory.getLoadedPackageInfo().packageName; |
+ ResourceRewriter.rewriteRValues( |
+ mWebViewDelegate.getPackageId(context.getResources(), packageName)); |
AwResource.setResources(context.getResources()); |
AwResource.setErrorPageResources(android.R.raw.loaderror, android.R.raw.nodomain); |