Move ui and content resources into one location.

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 420cd76e53ed44d857afb7181bfaeeb97a205981..efd2c7072fe6ba35f95a7459d00d308207489573 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -259,12 +259,34 @@
      }, { # android_webview_build==1
       'targets': [
         {
-          'target_name': 'android_webview_strings',
+          'target_name': 'android_webview_jarjar_ui_resources',
+          'android_unmangled_name': 1,

[newt (away), 2014/05/12 20:11:23]

android_unmangled_name never seems to be used. Remove this?

[Torne, 2014/05/13 13:46:52]

This isn't a varible, it's a parameter for the generator, which disables the
normal name mangling applied to gyp targets. This makes it easier to refer to
the gyp-generated target from the Android.mk.

+          'type': 'none',
+          'variables': {
+            'res_dir': '../ui/android/java/res',
+            'rules_file': '../android_webview/build/jarjar-rules.txt',
+          },
+          'includes': ['../android_webview/build/jarjar_resources.gypi'],
+        },
+        {
+          'target_name': 'android_webview_jarjar_content_resources',
+          'android_unmangled_name': 1,
+          'type': 'none',
+          'variables': {
+            'res_dir': '../content/public/android/java/res',
+            'rules_file': '../android_webview/build/jarjar-rules.txt',
+          },
+          'includes': ['../android_webview/build/jarjar_resources.gypi'],
+        },
+        {
+          'target_name': 'android_webview_resources',
           'type': 'none',
           'android_unmangled_name': 1,
           'dependencies': [
             '../content/content.gyp:content_strings_grd',
             '../ui/android/ui_android.gyp:ui_strings_grd',
+            'android_webview_jarjar_ui_resources',
+            'android_webview_jarjar_content_resources'
           ],
         },
       ],