Move ui and content resources into one location.

android_webview/Android.mk

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This package provides the parts of the WebView java code which live in the
 # Chromium tree. This is built into a static library so it can be used by the
 # glue layer in the Android tree.
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := android_webview_java
 
 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 \
     $(LOCAL_PATH)/../net/android/java/src \
     $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../content/public/android/java/src) \
     ../content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl \
     ../content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl \
     ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl \
@@ skipping 11 matching lines @@
         ../components/web_contents_delegate_android/android/java/src) \
     $(call all-java-files-under, \
         ../components/navigation_interception/android/java/src) \
 
 # This directory includes .java files that are generated by the normal gyp build, but are checked in
 # for the Android build.
 # TODO(torne, cjhopman): Consider removing this.
 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
 # build system. http://crbug.com/358141
 LOCAL_GENERATED_SOURCES := \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/ApplicationState.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/base/MemoryPressureLevelList.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/GestureEventType.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/PageTransitionTypes.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/SpeechRecognitionError.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/PopupItemType.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ResultCodes.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ScreenOrientationValues.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/media/ImageFormat.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertificateMimeType.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/CertVerifyStatusAndroid.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/NetError.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/net/PrivateKeyType.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/WindowOpenDisposition.java \
 $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/ui/gfx/BitmapFormat.java \
 
 # content dependencies on java components that are provided by the system on
 # android
 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava
 
+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.
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_pak
 LOCAL_MODULE_STEM := webviewchromium
 LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
@@ skipping 306 matching lines @@
 LOCAL_MODULE := webviewchromium_webkit_strings_zh-CN.pak
 LOCAL_MODULE_STEM := zh-CN
 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-CN.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_webkit_strings_zh-TW.pak
 LOCAL_MODULE_STEM := zh-TW
 LOCAL_BUILT_MODULE_STEM := webkit/webkit_strings_zh-TW.pak
 include $(LOCAL_PATH)/webview_pak.mk