Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: ui/aura/aura.gyp

Issue 10820003: Remove ui_resources_default_100_percent.rc and theme_resources_default_100_percent.rc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 '../compositor/compositor.gyp:compositor_test_support', 219 '../compositor/compositor.gyp:compositor_test_support',
220 '../ui.gyp:ui', 220 '../ui.gyp:ui',
221 '../ui.gyp:ui_resources', 221 '../ui.gyp:ui_resources',
222 'aura', 222 'aura',
223 ], 223 ],
224 'include_dirs': [ 224 'include_dirs': [
225 '..', 225 '..',
226 ], 226 ],
227 'sources': [ 227 'sources': [
228 'demo/demo_main.cc', 228 'demo/demo_main.cc',
229 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' ,
230 ], 229 ],
231 }, 230 },
232 { 231 {
233 'target_name': 'aura_bench', 232 'target_name': 'aura_bench',
234 'type': 'executable', 233 'type': 'executable',
235 'dependencies': [ 234 'dependencies': [
236 '../../base/base.gyp:base', 235 '../../base/base.gyp:base',
237 '../../base/base.gyp:base_i18n', 236 '../../base/base.gyp:base_i18n',
238 '../../skia/skia.gyp:skia', 237 '../../skia/skia.gyp:skia',
239 '../../third_party/icu/icu.gyp:icui18n', 238 '../../third_party/icu/icu.gyp:icui18n',
240 '../../third_party/icu/icu.gyp:icuuc', 239 '../../third_party/icu/icu.gyp:icuuc',
241 '../compositor/compositor.gyp:compositor', 240 '../compositor/compositor.gyp:compositor',
242 '../compositor/compositor.gyp:compositor_test_support', 241 '../compositor/compositor.gyp:compositor_test_support',
243 '../ui.gyp:ui', 242 '../ui.gyp:ui',
244 '../ui.gyp:ui_resources', 243 '../ui.gyp:ui_resources',
245 'aura', 244 'aura',
246 ], 245 ],
247 'include_dirs': [ 246 'include_dirs': [
248 '..', 247 '..',
249 ], 248 ],
250 'sources': [ 249 'sources': [
251 'bench/bench_main.cc', 250 'bench/bench_main.cc',
252 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' ,
253 ], 251 ],
254 }, 252 },
255 { 253 {
256 'target_name': 'aura_unittests', 254 'target_name': 'aura_unittests',
257 'type': 'executable', 255 'type': 'executable',
258 'dependencies': [ 256 'dependencies': [
259 '../../base/base.gyp:test_support_base', 257 '../../base/base.gyp:test_support_base',
260 '../../chrome/chrome_resources.gyp:packed_resources', 258 '../../chrome/chrome_resources.gyp:packed_resources',
261 '../../skia/skia.gyp:skia', 259 '../../skia/skia.gyp:skia',
262 '../../testing/gtest.gyp:gtest', 260 '../../testing/gtest.gyp:gtest',
(...skipping 13 matching lines...) Expand all
276 'gestures/gesture_recognizer_unittest.cc', 274 'gestures/gesture_recognizer_unittest.cc',
277 'test/run_all_unittests.cc', 275 'test/run_all_unittests.cc',
278 'test/test_suite.cc', 276 'test/test_suite.cc',
279 'test/test_suite.h', 277 'test/test_suite.h',
280 'root_window_unittest.cc', 278 'root_window_unittest.cc',
281 'shared/compound_event_filter_unittest.cc', 279 'shared/compound_event_filter_unittest.cc',
282 'shared/input_method_event_filter_unittest.cc', 280 'shared/input_method_event_filter_unittest.cc',
283 'event_filter_unittest.cc', 281 'event_filter_unittest.cc',
284 'event_unittest.cc', 282 'event_unittest.cc',
285 'window_unittest.cc', 283 'window_unittest.cc',
286 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc' ,
287 ], 284 ],
288 'conditions': [ 285 'conditions': [
289 # osmesa GL implementation is used on linux. 286 # osmesa GL implementation is used on linux.
290 ['OS=="linux"', { 287 ['OS=="linux"', {
291 'dependencies': [ 288 'dependencies': [
292 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 289 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
293 ], 290 ],
294 }], 291 }],
295 ], 292 ],
296 }, 293 },
297 ], 294 ],
298 } 295 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698