Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'variables': { | 7 'variables': { |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['inside_chromium_build==1', { | 9 ['inside_chromium_build==1', { |
| 10 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', | 10 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', |
| 11 }, { | 11 }, { |
| 12 'webkit_src_dir': '<(DEPTH)/../../..', | 12 'webkit_src_dir': '<(DEPTH)/../../..', |
| 13 }], | 13 }], |
| 14 ], | 14 ], |
| 15 }, | 15 }, |
| 16 'webkit_src_dir': '<(webkit_src_dir)', | 16 'webkit_src_dir': '<(webkit_src_dir)', |
| 17 'conditions': [ | 17 'conditions': [ |
| 18 ['inside_chromium_build==1', { | 18 ['inside_chromium_build==1', { |
| 19 'cc_stubs_dirs': ['stubs'], | 19 'cc_stubs_dirs': [], |
| 20 }, { | 20 }, { |
| 21 'cc_stubs_dirs': [ | 21 'cc_stubs_dirs': [ |
| 22 'stubs', | |
| 23 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 22 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 24 '<(webkit_src_dir)', | 23 '<(webkit_src_dir)', |
| 25 '<(webkit_src_dir)/Source/WebCore/platform', | 24 '<(webkit_src_dir)/Source/WebCore/platform', |
| 26 '<(webkit_src_dir)/Source/WebCore/platform/animation', | 25 '<(webkit_src_dir)/Source/WebCore/platform/animation', |
|
danakj
2012/11/10 01:04:20
Should all these go too?
tfarina
2012/11/10 01:06:13
aren't these used yet through #include <public/Foo
piman
2012/11/10 01:08:18
Maybe? I don't know why they're still here. I can
| |
| 27 '<(webkit_src_dir)/Source/WebCore/platform/chromium', | 26 '<(webkit_src_dir)/Source/WebCore/platform/chromium', |
| 28 '<(webkit_src_dir)/Source/WebCore/platform/graphics', | 27 '<(webkit_src_dir)/Source/WebCore/platform/graphics', |
| 29 '<(webkit_src_dir)/Source/WebCore/platform/graphics/chromium', | 28 '<(webkit_src_dir)/Source/WebCore/platform/graphics/chromium', |
| 30 '<(webkit_src_dir)/Source/WebCore/platform/graphics/filters', | 29 '<(webkit_src_dir)/Source/WebCore/platform/graphics/filters', |
| 31 '<(webkit_src_dir)/Source/WebCore/platform/graphics/gpu', | 30 '<(webkit_src_dir)/Source/WebCore/platform/graphics/gpu', |
| 32 '<(webkit_src_dir)/Source/WebCore/platform/graphics/skia', | 31 '<(webkit_src_dir)/Source/WebCore/platform/graphics/skia', |
| 33 '<(webkit_src_dir)/Source/WebCore/platform/graphics/transforms', | 32 '<(webkit_src_dir)/Source/WebCore/platform/graphics/transforms', |
| 34 '<(webkit_src_dir)/Source/WebCore/rendering', | 33 '<(webkit_src_dir)/Source/WebCore/rendering', |
| 35 '<(webkit_src_dir)/Source/WebCore/rendering/style', | 34 '<(webkit_src_dir)/Source/WebCore/rendering/style', |
| 36 ], | 35 ], |
| 37 }], | 36 }], |
| 38 ], | 37 ], |
| 39 }, | 38 }, |
| 40 'conditions': [ | 39 'conditions': [ |
| 41 ['inside_chromium_build==0', { | 40 ['inside_chromium_build==0', { |
| 42 'defines': [ | 41 'defines': [ |
| 43 'INSIDE_WEBKIT_BUILD=1', | 42 'INSIDE_WEBKIT_BUILD=1', |
| 44 ], | 43 ], |
| 45 }], | 44 }], |
| 46 ], | 45 ], |
| 47 } | 46 } |
| OLD | NEW |