content/content_shell.gypi - Issue 12963009: Split apk-build.xml into 3 steps

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: content/content_shell.gypi

Issue 12963009: Split apk-build.xml into 3 steps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Include classes.dex in apk Created 7 years, 9 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: content/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index 28404e33243008e3d6b4e124dff4ccac243735ef..10830fdf46e5a89893215b43f7a4cb740785714c 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -675,7 +675,7 @@

'apk_name': 'ContentShell',

'manifest_package_name': 'org.chromium.content_shell_apk',

'java_in_dir': 'shell/android/shell_apk',

- 'resource_dir': 'res',

+ 'resource_dir': 'shell/android/shell_apk/res',

'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],

'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],

'asset_location': '<(ant_build_out)/content_shell/assets',