Move ui and content resources into one location.

android_webview/java_library_common.mk

Index: android_webview/java_library_common.mk
diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk
new file mode 100644
index 0000000000000000000000000000000000000000..6029191c19e7fe2bebcf92f97bf86d745f08d723
--- /dev/null
+++ b/android_webview/java_library_common.mk
@@ -0,0 +1,65 @@
+# Copyright (c) 2014 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.
+
+LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
+
+# 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
+