content/content_tests.gypi - Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

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 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 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

Index: content/content_tests.gypi

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

index cfdda71a6ea2bf3d4c28ba88efc4838ad154af47..6bc839b3187b0ea4ad54e7de9a9fd910cda43d24 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -259,7 +259,7 @@

'../third_party/WebKit/public/blink.gyp:blink',

}],

- ['OS == "win" or toolkit_uses_gtk == 1', {

+ ['OS == "win"', {

'dependencies': [

'../sandbox/sandbox.gyp:sandbox',

@@ -1208,7 +1208,7 @@

['exclude', '^browser/compositor/'],

}],

- ['OS!="android" and OS!="ios"', {

+ ['OS!="android" and OS!="ios" and OS!="linux"', {

# npapi test plugin doesn't build on android or ios

'dependencies': [

# Runtime dependencies

@@ -1649,7 +1649,7 @@

}],

- ['OS!="android" and OS!="ios"', {

+ ['OS!="android" and OS!="ios" and OS!="linux"', {

# npapi test plugin doesn't build on android or ios

'targets': [

{

« no previous file with comments | « content/content_shell.gypi ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »