content/content_shell.gypi - Issue 10223007: Package and load native library in content shell. Add content shell util scripts.

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 10223007: Package and load native library in content shell. Add content shell util scripts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tweaks Created 8 years, 8 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

« build/android/adb_kill_content_shell ('K') | « build/android/envsetup.sh ('k') | content/shell/android/OWNERS » ('j') | content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_shell.gypi

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

index 8508ea29bfa9ff740e7d1a92a269c936feb5da8d..71d213fd9f289aad3b25eea07e574167eee63e4e 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -534,6 +534,12 @@

'action': ['cp', '<@(_inputs)', '<@(_outputs)'],

{

+ 'action_name': 'copy_content_shell_content_view',

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

+ 'outputs': ['<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so'],

+ 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],

+ },

+ {

'action_name': 'content_shell_apk',

'inputs': [

'<(DEPTH)/content/shell/android/content_shell_apk.xml',

@@ -542,7 +548,6 @@

'<!@(find shell/android/res -name "*")',

'<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar',

'<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',

- # TODO(tedchoc): Move the .so file so it can be consumed by the apk.

'<(SHARED_LIB_DIR)/libcontent_shell_content_view.so',

'outputs': [