Move ui and content resources into one location.

android_webview/Android.mk

Index: android_webview/Android.mk
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index dd9e13b843d970f4c987b8aa1c1aed4fabb39877..e78ab16b60915f435e74342900b36040a2e6caeb 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -15,11 +15,6 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 
-# resource glue layer
-LOCAL_SRC_FILES += \
-    $(call all-java-files-under, ../content/public/android/java/resource_map) \
-    $(call all-java-files-under, ../ui/android/java/resource_map) \
-
 # contentview and its dependencies
 LOCAL_AIDL_INCLUDES := \
     $(LOCAL_PATH)/../content/public/android/java/src \
@@ -51,6 +46,11 @@ LOCAL_SRC_FILES += \
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, java/generated_src)
 
+# Depend on the android_webview_strings target to ensure the grd->string.xml
+# processing takes place.
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+    $(call intermediates-dir-for,GYP,android_webview_resources,,,$(TARGET_2ND_ARCH))/android_webview_resources.stamp
+
 # Java files generated from .template rules. This list should match list of java dependencies in
 # android_webview/all_webview.gyp
 # TODO(torne): remove TARGET_2ND_ARCH here once we're no longer 64-bit blacklisted in the Android
@@ -76,8 +76,21 @@ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chro
 # android
 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava
 
-include $(BUILD_STATIC_JAVA_LIBRARY)
+LOCAL_FULL_MANIFEST_FILE := external/chromium_org/build/android/AndroidManifest.xml
 
+# resources
+LOCAL_RESOURCE_DIR := \
+    $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_content_resources/jarjar_res \
+    $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/android_webview_jarjar_ui_resources/jarjar_res \
+    $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/ui_strings_grd/res_grit \
+    $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/content_strings_grd/res_grit
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --custom-package com.android.org.chromium
+LOCAL_AAPT_FLAGS += --extra-packages org.chromium.ui
+LOCAL_AAPT_FLAGS += --extra-packages org.chromium.content
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
 
 ########################################################
 # These packages are the resource paks used by webview.