OLD | NEW |
---|---|
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
301 'win/hwnd_util.cc', | 301 'win/hwnd_util.cc', |
302 'win/hwnd_util.h', | 302 'win/hwnd_util.h', |
303 'win/scoped_set_map_mode.h', | 303 'win/scoped_set_map_mode.h', |
304 'win/singleton_hwnd.cc', | 304 'win/singleton_hwnd.cc', |
305 'win/singleton_hwnd.h', | 305 'win/singleton_hwnd.h', |
306 'win/window_impl.cc', | 306 'win/window_impl.cc', |
307 'win/window_impl.h', | 307 'win/window_impl.h', |
308 ], | 308 ], |
309 'conditions': [ | 309 'conditions': [ |
310 ['OS=="ios"', { | 310 ['OS=="ios"', { |
311 'dependencies': [ | |
312 "<(DEPTH)/ui/ios/ios.gyp:ios", | |
313 ], | |
314 'export_dependent_settings': [ | |
lliabraa
2014/08/25 19:41:52
maybe this is not correct...I get the following wa
stuartmorgan
2014/08/25 20:17:37
The ui/ gyp files aren't set up the way they used
lliabraa
2014/08/28 12:13:20
changed to link_settings in the ui_ios.gyp file.
| |
315 # Targets that depend on this gfx target, will also need the | |
316 # direct_dependent_settings of ios.gyp:ios in order to use the | |
317 # categories defined there. | |
318 "<(DEPTH)/ui/ios/ios.gyp:ios", | |
319 ], | |
311 # iOS only uses a subset of UI. | 320 # iOS only uses a subset of UI. |
312 'sources/': [ | 321 'sources/': [ |
313 ['exclude', '^codec/jpeg_codec\\.cc$'], | 322 ['exclude', '^codec/jpeg_codec\\.cc$'], |
314 ], | 323 ], |
315 }, { | 324 }, { |
316 'dependencies': [ | 325 'dependencies': [ |
317 '<(libjpeg_gyp_path):libjpeg', | 326 '<(libjpeg_gyp_path):libjpeg', |
318 ], | 327 ], |
319 }], | 328 }], |
320 # TODO(asvitkine): Switch all platforms to use canvas_skia.cc. | 329 # TODO(asvitkine): Switch all platforms to use canvas_skia.cc. |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
469 ], | 478 ], |
470 'variables': { | 479 'variables': { |
471 'jni_gen_package': 'ui/gfx', | 480 'jni_gen_package': 'ui/gfx', |
472 }, | 481 }, |
473 'includes': [ '../../build/jni_generator.gypi' ], | 482 'includes': [ '../../build/jni_generator.gypi' ], |
474 }, | 483 }, |
475 ], | 484 ], |
476 }], | 485 }], |
477 ], | 486 ], |
478 } | 487 } |
OLD | NEW |