webkit/compositor_bindings/compositor_bindings.gyp - Issue 14823005: Remove inside_chromium_build gyp variable

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: webkit/compositor_bindings/compositor_bindings.gyp

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort gyps, fix ios Created 7 years, 7 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: webkit/compositor_bindings/compositor_bindings.gyp

diff --git a/webkit/compositor_bindings/compositor_bindings.gyp b/webkit/compositor_bindings/compositor_bindings.gyp

index 728fd3297841e15377b0a6a4bc04bc1e2c90a5ed..3ff6fe5025027ef17ce4a17c9e9b521a4cb966e4 100644

--- a/webkit/compositor_bindings/compositor_bindings.gyp

+++ b/webkit/compositor_bindings/compositor_bindings.gyp

@@ -37,13 +37,6 @@

'web_transform_animation_curve_impl.cc',

'web_transform_animation_curve_impl.h',

- 'conditions': [

- ['inside_chromium_build==0', {

- 'webkit_src_dir': '../../../../..',

- },{

- 'webkit_src_dir': '../../third_party/WebKit',

- }],

- ],

'targets': [

{

@@ -72,9 +65,9 @@

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

'../../media/media.gyp:media',

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

+ '../../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',

'../../ui/ui.gyp:ui',

'../../webkit/gpu/webkit_gpu.gyp:webkit_gpu',

- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',

'sources': [

'<@(webkit_compositor_bindings_sources)',

« no previous file with comments | « webkit/base/webkit_base.gypi ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »