[android_webview] Make it possible to share the glue Java with Android.

This change makes it possible to use the android_webview/glue code in
the Android build.

BUG=447666

Review URL: https://codereview.chromium.org/846673002

Cr-Commit-Position: refs/heads/master@{#310817}

1 files changed, 12 insertions, 5 deletions

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 caebb6e..854068f 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
@@ -314,11 +314,18 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
     }
 
     private void setUpResources(Context context) {
-        // The resources are always called com.android.webview even if the manifest has had the
-        // package renamed.
-        final String packageName = WebViewFactory.getLoadedPackageInfo().packageName;
-        ResourceRewriter.rewriteRValues(
-                mWebViewDelegate.getPackageId(context.getResources(), packageName));
+        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"));
+        }
 
         AwResource.setResources(context.getResources());
         AwResource.setErrorPageResources(android.R.raw.loaderror, android.R.raw.nodomain);