content/content_tests.gypi - Issue 220073002: Turns on use_mojo for android

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_tests.gypi

Issue 220073002: Turns on use_mojo for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add export Created 6 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_tests.gypi

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

index 2289ef4509c1f5c20210adbec1bb932cbdae8a10..9acefdb17d5316a127c5109dcc486b2984cc1eb0 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -912,7 +912,6 @@

'type': 'static_library',

'dependencies': [

'content_shell_lib',

- 'content.gyp:content_browser',

'../skia/skia.gyp:skia',

'../testing/gtest.gyp:gtest',

@@ -924,6 +923,17 @@

'public/test/content_browser_test_utils.h',

'public/test/content_browser_test_utils_mac.mm',

+ 'conditions': [

+ ['use_mojo==1 and OS=="android"', {

+ 'dependencies': [

+ 'content.gyp:content_app_both',

+ ],

+ }, {

+ 'dependencies': [

+ 'content.gyp:content_browser',

+ ],

+ }],

+ ],

{

'target_name': 'web_ui_test_mojo_bindings',

« no previous file with comments | « content/app/mojo/mojo_init.h ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »