diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:27:51 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:27:51 +0000 |
| commit | 979f7a8ef2b439c4e032ae6d777178f847d63e75 (patch) | |
| tree | 3c24c57f94571dbb0a561b06df9ac9f5b93b5638 | |
| parent | 0dcca8462ff8e75b32189ee6f32dcf3bbe883068 (diff) | |
| download | chromium_src-979f7a8ef2b439c4e032ae6d777178f847d63e75.zip chromium_src-979f7a8ef2b439c4e032ae6d777178f847d63e75.tar.gz chromium_src-979f7a8ef2b439c4e032ae6d777178f847d63e75.tar.bz2 | |
Android WebView: create a java module.
The WebView needs a bunch of Java code from the Chromium tree
(contentview and its dependencies) in order to build. Introduce an
Android build system makefile into android_webview which builds a
suitable static java library.
R=benm@chromium.org
BUG=
Review URL: https://codereview.chromium.org/11185025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162404 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | android_webview/Android.mk | 39 |
2 files changed, 43 insertions, 3 deletions
@@ -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) |