android_webview/Android.mk - Issue 11822002: Fix downstream android webview build

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_webview/Android.mk

Issue 11822002: Fix downstream android webview build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update comment Created 7 years, 11 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_webview/Android.mk

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

index 6455be23be65a23cd490bf8cdf4232008d5ffd6e..c1aa86adbdada37f3e6beef6d16c3410a67eb9b4 100644

--- a/android_webview/Android.mk

+++ b/android_webview/Android.mk

@@ -42,6 +42,7 @@ LOCAL_SRC_FILES += \

$(call all-java-files-under, \

../content/components/navigation_interception/java/src) \

# Generated by net.gyp:net_errors_java, net.gyp:certificate_mime_types_java,

# and content.gyp:page_transition_types_java

LOCAL_GENERATED_SOURCES := \

@@ -49,6 +50,9 @@ $(call intermediates-dir-for,GYP,shared)/templates/org.chromium.content.browser/

$(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/CertificateMimeType.java \

$(call intermediates-dir-for,GYP,shared)/templates/org.chromium.net/NetError.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)

« no previous file with comments | « no previous file | content/content.gyp » ('j') | no next file with comments »