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 525fb8422e99a8b3de95f92ac9070b914171a47b..215dd28acc94baea1c5726b7ff6995df74827357 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -13,73 +13,37 @@ LOCAL_MODULE := android_webview_java
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
-
+include $(LOCAL_PATH)/java_library_common.mk
 # 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 \
-    ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl \
-    $(call all-java-files-under, ../base/android/java/src) \
-    $(call all-java-files-under, ../media/base/android/java/src) \
-    $(call all-java-files-under, ../net/android/java/src) \
-    $(call all-java-files-under, ../ui/android/java/src) \
-    $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \
-    $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src)
-
-# browser components
-LOCAL_SRC_FILES += \
-    $(call all-java-files-under, \
-        ../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)
-
-# 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/CanonicalAxisIndex.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalButtonIndex.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
-
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+########################################################
+# This is intended to replace android_webview_java once the Android side of
+# the code that uses the WebView is updated. In the transition period the
+# goal of having this here is to make sure the new build isn't broken.
+include $(CLEAR_VARS)
+LOCAL_MODULE := android_webview_java_with_new_resources
+
+LOCAL_MODULE_TAGS := optional
+
+# 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
+
+include $(LOCAL_PATH)/java_library_common.mk
+
+# resources
+include $(LOCAL_PATH)/build/resources_config.mk
+LOCAL_FULL_MANIFEST_FILE := $(android_webview_manifest_file)
+LOCAL_RESOURCE_DIR := $(android_webview_resources_dirs)
+LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
 
 ########################################################
 # These packages are the resource paks used by webview.