summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk7
-rw-r--r--android_webview/Android.mk39
2 files changed, 43 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 2f7c924..cc87c89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,11 +3,12 @@
# found in the LICENSE file.
# This Android makefile is used to build WebView in the Android build system.
-# gyp autogenerates the real makefiles, which we just include here if we are
-# doing a WebView build. For other builds, this makefile does nothing, which
-# prevents the Android build system from mistakenly loading any other
+# gyp autogenerates most of the real makefiles, which we just include here if
+# we are doing a WebView build. For other builds, this makefile does nothing,
+# which prevents the Android build system from mistakenly loading any other
# Android.mk that may exist in the Chromium tree.
ifdef CHROME_ANDROID_BUILD_WEBVIEW
include $(call my-dir)/GypAndroid.mk
+include $(call my-dir)/android_webview/Android.mk
endif
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
new file mode 100644
index 0000000..56e51e8
--- /dev/null
+++ b/android_webview/Android.mk
@@ -0,0 +1,39 @@
+# 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)
+
+# contentview
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/../content/public/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/ISandboxedProcessCallback.aidl \
+ ../content/public/android/java/src/org/chromium/content/common/ISandboxedProcessService.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) \
+
+# TODO(mkosiba): Remove chromium_chrome dep once required browser
+# components are in (replace it with contentview).
+LOCAL_SRC_FILES += \
+ $(call all-java-files-under, ../chrome/android/java/src) \
+ $(call all-java-files-under, ../chrome/browser/component/web_contents_delegate_android/java/src) \
+ $(call all-java-files-under, ../chrome/browser/component/navigation_interception/java/src) \
+
+# This file is generated by net.gyp:net_errors_java
+LOCAL_GENERATED_SOURCES := $(call intermediates-dir-for,GYP,shared)/net/template/NetError.java \
+
+include $(BUILD_STATIC_JAVA_LIBRARY)