android_webview/Android.mk - Issue 12210130: [Android WebView] Fix build break, make sure the gyp file is generated for android webview

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 12210130: [Android WebView] Fix build break, make sure the gyp file is generated for android webview (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 10 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:

View side-by-side diff with in-line comments

Download patch

Index: android_webview/Android.mk

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

index 90a38601f770a8198ee1bc19e6ecd9334be665d0..38ee174c2e587f1ab7c1f14d785dd33d67203028 100644

--- a/android_webview/Android.mk

+++ b/android_webview/Android.mk

@@ -44,10 +44,11 @@ LOCAL_SRC_FILES += \

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

-# and content.gyp:page_transition_types_java

+# net.gyp:private_key_types_java and content.gyp:page_transition_types_java

LOCAL_GENERATED_SOURCES := \

$(call intermediates-dir-for,GYP,shared)/templates/org.chromium.content.browser/PageTransitionTypes.java \

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

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

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