android_webview/Android.mk - Issue 11308030: Use _target_name instead of package_name for java*.gypi

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 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar

Patch Set: And fix android_webview_test_apk 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 cc5043b0aa7c8ac1a6f09c0881d1bf6632ac63ab..bc43058c6935755c5245ccba0b5322569b32e732 100644

--- a/android_webview/Android.mk

+++ b/android_webview/Android.mk

@@ -65,14 +65,14 @@ include $(BUILD_STATIC_JAVA_LIBRARY)

include $(CLEAR_VARS)

LOCAL_MODULE := webviewchromium_pak

LOCAL_MODULE_STEM := webviewchromium

-LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak

+LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium.pak

include $(LOCAL_PATH)/webview_pak.mk

# TODO(benm): remove when downstream depends on localised paks.

include $(CLEAR_VARS)

LOCAL_MODULE := webviewchromium_strings_pak

LOCAL_MODULE_STEM := webviewchromium_strings

-LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak

+LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium_strings.pak

include $(LOCAL_PATH)/webview_pak.mk

include $(CLEAR_VARS)

« no previous file with comments | « no previous file | android_webview/android_webview.gyp » ('j') | build/java.gypi » ('J')