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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 # Sources lists shared with GN build. | 7 # Sources lists shared with GN build. |
| 8 'views_sources': [ | 8 'views_sources': [ |
| 9 'accessibility/native_view_accessibility.cc', | 9 'accessibility/native_view_accessibility.cc', |
| 10 'accessibility/native_view_accessibility.h', | 10 'accessibility/native_view_accessibility.h', |
| (...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 781 ['OS == "win"', { | 781 ['OS == "win"', { |
| 782 'sources': [ '<@(views_desktop_aura_win_sources)' ], | 782 'sources': [ '<@(views_desktop_aura_win_sources)' ], |
| 783 }], | 783 }], |
| 784 ['use_ozone==1', { | 784 ['use_ozone==1', { |
| 785 'sources': [ '<@(views_desktop_aura_ozone_sources)' ], | 785 'sources': [ '<@(views_desktop_aura_ozone_sources)' ], |
| 786 }], | 786 }], |
| 787 ], | 787 ], |
| 788 }], | 788 }], |
| 789 ['OS=="mac"', { | 789 ['OS=="mac"', { |
| 790 'dependencies': [ | 790 'dependencies': [ |
| 791 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp :google_toolbox_for_mac', | |
| 791 '../accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_wi dget_mac', | 792 '../accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_wi dget_mac', |
| 792 ], | 793 ], |
| 793 'link_settings': { | 794 'link_settings': { |
| 794 'libraries': [ | 795 'libraries': [ |
| 795 # Required by bridged_native_widget.mm. | 796 # Required by bridged_native_widget.mm. |
| 796 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 797 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', |
| 797 ], | 798 ], |
| 799 'conditions': [ | |
| 800 ['component=="static_library"', { | |
| 801 # Needed to link to Obj-C static libraries. | |
|
karandeepb
2016/03/04 03:01:56
I am not sure if this needs to be added to a gn fi
tapted
2016/03/04 04:15:01
ldflags += [ "-Wl,-ObjC" ]
would probably do it.
| |
| 802 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | |
| 803 }], | |
| 804 ], | |
| 798 }, | 805 }, |
| 799 }], | 806 }], |
| 800 ], | 807 ], |
| 801 }, # target_name: views | 808 }, # target_name: views |
| 802 { | 809 { |
| 803 # GN version: //ui/views:test_support | 810 # GN version: //ui/views:test_support |
| 804 'target_name': 'views_test_support', | 811 'target_name': 'views_test_support', |
| 805 'type': 'static_library', | 812 'type': 'static_library', |
| 806 'dependencies': [ | 813 'dependencies': [ |
| 807 '../../base/base.gyp:base', | 814 '../../base/base.gyp:base', |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1010 '../aura/aura.gyp:aura', | 1017 '../aura/aura.gyp:aura', |
| 1011 '../wm/wm.gyp:wm', | 1018 '../wm/wm.gyp:wm', |
| 1012 ], | 1019 ], |
| 1013 }], | 1020 }], |
| 1014 ], | 1021 ], |
| 1015 }, # target_name: macviews_interactive_ui_tests | 1022 }, # target_name: macviews_interactive_ui_tests |
| 1016 ], # targets | 1023 ], # targets |
| 1017 }], | 1024 }], |
| 1018 ], # conditions | 1025 ], # conditions |
| 1019 } | 1026 } |
| OLD | NEW |