chrome/chrome_android.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: chrome/chrome_android.gypi

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

Patch Set: Rebase 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: chrome/chrome_android.gypi

diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi

index 245b321990e89de51a02f4437ffb86553fd97fc6..1af9aec8644af05e95e664fbf14e9f1be2358aa8 100644

--- a/chrome/chrome_android.gypi

+++ b/chrome/chrome_android.gypi

@@ -58,7 +58,7 @@

'apk_name': 'ChromiumTestShell',

'manifest_package_name': 'org.chromium.chrome.testshell',

'java_in_dir': 'android/testshell/java',

- 'resource_dir': '../res',

+ 'resource_dir': 'android/testshell/res',

'asset_location': '<(ant_build_out)/../assets/<(package_name)',

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

'additional_input_paths': [

« no previous file with comments | « build/java_apk.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »