Android.mk - Issue 11185025: Android WebView: create a java module.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Android.mk

Issue 11185025: Android WebView: create a java module. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Include the new makefile when we're building webview Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Android.mk

diff --git a/Android.mk b/Android.mk

index 2f7c924f6b0c13a199c53333793c1ba21662d90f..cc87c89578e4b6623a2ef415d7428b8cd9422dfe 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

« no previous file with comments | « no previous file | android_webview/Android.mk » ('j') | android_webview/Android.mk » ('J')