content/content_tests.gypi - Issue 10802064: Make content_shell and content_browsertests working with aura

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 10802064: Make content_shell and content_browsertests working with aura (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: add chrome packed_resources dependency for executable binary Created 8 years, 5 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 539fe72f2f5b2fb859b66c3b6fbd54a2b637094e..22178501f9fe942a4af02a7ff8163aa8b0d56a71 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -128,6 +128,7 @@

'test/test_web_contents_view.h',

'test/unittest_test_suite.cc',

'test/web_contents_tester.cc',

+ '../chrome/chrome_resources.gyp:packed_resources',

# TODO(phajdan.jr): Those files should be moved to webkit

# test support target.

@@ -595,10 +596,19 @@

}],

['use_aura==1', {

+ 'dependencies': [

+ '../chrome/chrome_resources.gyp:packed_resources',

+ ],

'sources!': [

'browser/plugin_browsertest.cc',

}],

+ ['chromeos==1', {

+ 'dependencies': [

+ '../chromeos/chromeos.gyp:chromeos_test_support',

+ '../testing/gmock.gyp:gmock',

+ ],

+ }],

['target_arch!="arm"', {

'dependencies': [

# Runtime dependencies