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 # TODO(dmaclach): can we pick this up some other way? Right now it's | 7 # TODO(dmaclach): can we pick this up some other way? Right now it's |
8 # duplicated from chrome.gyp | 8 # duplicated from chrome.gyp |
9 'chromium_code': 1, | 9 'chromium_code': 1, |
10 # Use consistent strings across all platforms. Note that the plugin name | 10 # Use consistent strings across all platforms. Note that the plugin name |
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
380 'host/plugin/host_plugin.cc', | 380 'host/plugin/host_plugin.cc', |
381 'host/plugin/host_plugin_resource.h', | 381 'host/plugin/host_plugin_resource.h', |
382 'host/plugin/host_plugin_utils.cc', | 382 'host/plugin/host_plugin_utils.cc', |
383 'host/plugin/host_plugin_utils.h', | 383 'host/plugin/host_plugin_utils.h', |
384 'host/plugin/host_script_object.cc', | 384 'host/plugin/host_script_object.cc', |
385 'host/plugin/host_script_object.h', | 385 'host/plugin/host_script_object.h', |
386 ], | 386 ], |
387 'conditions': [ | 387 'conditions': [ |
388 ['OS=="mac"', { | 388 ['OS=="mac"', { |
389 'mac_bundle': 1, | 389 'mac_bundle': 1, |
390 'link_settings': { | |
391 'libraries': [ | |
392 '$(SDKROOT)/System/Library/Frameworks/ServiceManagement.framework' , | |
393 ], | |
394 }, | |
390 'xcode_settings': { | 395 'xcode_settings': { |
391 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', | 396 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)', |
392 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist', | 397 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist', |
393 'INFOPLIST_PREPROCESS': 'YES', | 398 'INFOPLIST_PREPROCESS': 'YES', |
394 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to | 399 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to |
395 # duplicate string once | 400 # duplicate string once |
396 # http://code.google.com/p/gyp/issues/detail?id=243 is fixed. | 401 # http://code.google.com/p/gyp/issues/detail?id=243 is fixed. |
397 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE="<(host _plugin_mime_type)" HOST_PLUGIN_NAME="<(host_plugin_name)" HOST_PLUGIN_DESCRIPTI ON="<(host_plugin_description)"', | 402 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE="<(host _plugin_mime_type)" HOST_PLUGIN_NAME="<(host_plugin_name)" HOST_PLUGIN_DESCRIPTI ON="<(host_plugin_description)"', |
398 }, | 403 }, |
399 # TODO(mark): Come up with a fancier way to do this. It should | 404 # TODO(mark): Come up with a fancier way to do this. It should |
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1063 ], | 1068 ], |
1064 }, # end of target differ_block_sse2 | 1069 }, # end of target differ_block_sse2 |
1065 | 1070 |
1066 # Remoting unit tests | 1071 # Remoting unit tests |
1067 { | 1072 { |
1068 'target_name': 'remoting_unittests', | 1073 'target_name': 'remoting_unittests', |
1069 'type': 'executable', | 1074 'type': 'executable', |
1070 'dependencies': [ | 1075 'dependencies': [ |
1071 'remoting_base', | 1076 'remoting_base', |
1072 'remoting_client', | 1077 'remoting_client', |
1078 'remoting_host_plugin', | |
Lambros
2012/03/23 02:06:11
remoting_unittests seems to also need the ServiceM
Jamie
2012/03/23 03:24:05
It doesn't seem right to link in the entire host p
Lambros
2012/03/26 19:15:26
You're right, remoting_unittests shouldn't depend
| |
1073 'remoting_jingle_glue', | 1079 'remoting_jingle_glue', |
1074 'remoting_protocol', | 1080 'remoting_protocol', |
1075 '../base/base.gyp:base', | 1081 '../base/base.gyp:base', |
1076 '../base/base.gyp:base_i18n', | 1082 '../base/base.gyp:base_i18n', |
1077 '../base/base.gyp:test_support_base', | 1083 '../base/base.gyp:test_support_base', |
1078 '../media/media.gyp:media', | 1084 '../media/media.gyp:media', |
1079 '../ppapi/ppapi.gyp:ppapi_cpp', | 1085 '../ppapi/ppapi.gyp:ppapi_cpp', |
1080 '../testing/gmock.gyp:gmock', | 1086 '../testing/gmock.gyp:gmock', |
1081 '../testing/gtest.gyp:gtest', | 1087 '../testing/gtest.gyp:gtest', |
1082 '../ui/ui.gyp:ui', | 1088 '../ui/ui.gyp:ui', |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1179 '../base/allocator/allocator.gyp:allocator', | 1185 '../base/allocator/allocator.gyp:allocator', |
1180 ], | 1186 ], |
1181 }, | 1187 }, |
1182 ], | 1188 ], |
1183 ], | 1189 ], |
1184 }], | 1190 }], |
1185 ], # end of 'conditions' | 1191 ], # end of 'conditions' |
1186 }, # end of target 'remoting_unittests' | 1192 }, # end of target 'remoting_unittests' |
1187 ], # end of targets | 1193 ], # end of targets |
1188 } | 1194 } |
OLD | NEW |