| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 'demo/demo_main.cc', | 103 'demo/demo_main.cc', |
| 104 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', | 104 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', |
| 105 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', | 105 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
| 106 ], | 106 ], |
| 107 }, | 107 }, |
| 108 { | 108 { |
| 109 'target_name': 'aura_unittests', | 109 'target_name': 'aura_unittests', |
| 110 'type': 'executable', | 110 'type': 'executable', |
| 111 'dependencies': [ | 111 'dependencies': [ |
| 112 '../../base/base.gyp:test_support_base', | 112 '../../base/base.gyp:test_support_base', |
| 113 '../../chrome/chrome_resources.gyp:packed_resources', |
| 113 '../../skia/skia.gyp:skia', | 114 '../../skia/skia.gyp:skia', |
| 114 '../../testing/gtest.gyp:gtest', | 115 '../../testing/gtest.gyp:gtest', |
| 115 '../gfx/compositor/compositor.gyp:compositor_test_support', | 116 '../gfx/compositor/compositor.gyp:compositor_test_support', |
| 116 '../gfx/compositor/compositor.gyp:test_compositor', | 117 '../gfx/compositor/compositor.gyp:test_compositor', |
| 117 '../gfx/gl/gl.gyp:gl', | 118 '../gfx/gl/gl.gyp:gl', |
| 118 '../ui.gyp:gfx_resources', | 119 '../ui.gyp:gfx_resources', |
| 119 '../ui.gyp:ui', | 120 '../ui.gyp:ui', |
| 120 '../ui.gyp:ui_resources', | 121 '../ui.gyp:ui_resources', |
| 121 'test_support_aura', | 122 'test_support_aura', |
| 122 'aura', | 123 'aura', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 136 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', | 137 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', |
| 137 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', | 138 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |
| 138 ], | 139 ], |
| 139 # osmesa GL implementation is used on linux. | 140 # osmesa GL implementation is used on linux. |
| 140 'conditions': [ | 141 'conditions': [ |
| 141 ['OS=="linux"', { | 142 ['OS=="linux"', { |
| 142 'dependencies': [ | 143 'dependencies': [ |
| 143 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', | 144 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', |
| 144 ], | 145 ], |
| 145 }], | 146 }], |
| 146 ['OS!="mac"', { | |
| 147 'dependencies': [ | |
| 148 '../../chrome/chrome.gyp:packed_resources', | |
| 149 ], | |
| 150 }], | |
| 151 ], | 147 ], |
| 152 }, | 148 }, |
| 153 ], | 149 ], |
| 154 } | 150 } |
| OLD | NEW |