build/all_android.gyp - Issue 28123002: Introduce a separate gyp file for content shell and tests

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: build/all_android.gyp

Issue 28123002: Introduce a separate gyp file for content shell and tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 7 years, 2 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: build/all_android.gyp

diff --git a/build/all_android.gyp b/build/all_android.gyp

index 0e67fb4fb561b9cfb4575efb009edbe502a13852..708646c260000450173e71952f981f98df031c6d 100644

--- a/build/all_android.gyp

+++ b/build/all_android.gyp

@@ -17,7 +17,7 @@

'target_name': 'All',

'type': 'none',

'dependencies': [

- '../content/content.gyp:content_shell_apk',

+ '../content/content_shell_and_tests.gyp:content_shell_apk',

'<@(android_app_targets)',

'android_builder_tests',

'../android_webview/android_webview.gyp:android_webview_apk',

@@ -34,7 +34,7 @@

'type': 'none',

'dependencies': [

'../third_party/WebKit/public/all.gyp:all_blink',

- '../content/content.gyp:content_shell_apk',

+ '../content/content_shell_and_tests.gyp:content_shell_apk',

}, # target_name: all_webkit

{

@@ -64,10 +64,10 @@

'../cc/cc_tests.gyp:cc_unittests',

'../chrome/chrome.gyp:unit_tests',

'../components/components.gyp:components_unittests',

- '../content/content.gyp:content_browsertests',

- '../content/content.gyp:content_gl_tests',

- '../content/content.gyp:content_shell_test_apk',

- '../content/content.gyp:content_unittests',

+ '../content/content_shell_and_tests.gyp:content_browsertests',

+ '../content/content_shell_and_tests.gyp:content_gl_tests',

+ '../content/content_shell_and_tests.gyp:content_shell_test_apk',

+ '../content/content_shell_and_tests.gyp:content_unittests',

'../gpu/gpu.gyp:gl_tests',

'../gpu/gpu.gyp:gpu_unittests',

'../ipc/ipc.gyp:ipc_tests',

@@ -96,10 +96,10 @@

'../cc/cc_tests.gyp:cc_unittests_apk',

'../chrome/chrome.gyp:unit_tests_apk',

'../components/components.gyp:components_unittests_apk',

- '../content/content.gyp:content_browsertests_apk',

- '../content/content.gyp:content_gl_tests_apk',

- '../content/content.gyp:content_unittests_apk',

- '../content/content.gyp:video_decode_accelerator_unittest_apk',

+ '../content/content_shell_and_tests.gyp:content_browsertests_apk',

+ '../content/content_shell_and_tests.gyp:content_gl_tests_apk',

+ '../content/content_shell_and_tests.gyp:content_unittests_apk',

+ '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',

'../gpu/gpu.gyp:gl_tests_apk',

'../gpu/gpu.gyp:gpu_unittests_apk',

'../ipc/ipc.gyp:ipc_tests_apk',

« no previous file with comments | « build/all.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »