Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'remoting_host_installer_mac_roots': [ | 7 'remoting_host_installer_mac_roots': [ |
| 8 'host/installer/mac/', | 8 'host/installer/mac/', |
| 9 '<(DEPTH)/chrome/installer/mac/', | 9 '<(DEPTH)/chrome/installer/mac/', |
| 10 ], | 10 ], |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 183 'defines': [ | 183 'defines': [ |
| 184 'HOST_BUNDLE_NAME="<(host_bundle_name)"', | 184 'HOST_BUNDLE_NAME="<(host_bundle_name)"', |
| 185 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', | 185 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', |
| 186 'JSON_USE_EXCEPTION=0', | 186 'JSON_USE_EXCEPTION=0', |
| 187 ], | 187 ], |
| 188 'include_dirs': [ | 188 'include_dirs': [ |
| 189 '../third_party/jsoncpp/overrides/include/', | 189 '../third_party/jsoncpp/overrides/include/', |
| 190 '../third_party/jsoncpp/source/include/', | 190 '../third_party/jsoncpp/source/include/', |
| 191 '../third_party/jsoncpp/source/src/lib_json/', | 191 '../third_party/jsoncpp/source/src/lib_json/', |
| 192 ], | 192 ], |
| 193 | |
| 194 # These source files are included directly, instead of adding target | |
| 195 # dependencies, because the targets are not yet built for 64-bit on | |
| 196 # Mac OS X - http://crbug.com/125116. | |
| 197 # | |
| 198 # TODO(lambroslambrou): Fix this when Chrome supports building for | |
| 199 # Mac OS X 64-bit - http://crbug.com/128122. | |
| 200 'sources': [ | 193 'sources': [ |
|
tfarina
2015/12/24 20:50:43
I don't understand what is going on with remoting_
| |
| 201 '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp', | 194 '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp', |
| 202 '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp', | 195 '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp', |
| 203 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', | 196 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', |
| 204 '../third_party/modp_b64/modp_b64.cc', | |
| 205 'host/constants_mac.cc', | 197 'host/constants_mac.cc', |
| 206 'host/constants_mac.h', | 198 'host/constants_mac.h', |
| 207 'host/host_config_constants.cc', | 199 'host/host_config_constants.cc', |
| 208 'host/mac/me2me_preference_pane.h', | 200 'host/mac/me2me_preference_pane.h', |
| 209 'host/mac/me2me_preference_pane.mm', | 201 'host/mac/me2me_preference_pane.mm', |
| 210 'host/mac/me2me_preference_pane_confirm_pin.h', | 202 'host/mac/me2me_preference_pane_confirm_pin.h', |
| 211 'host/mac/me2me_preference_pane_confirm_pin.mm', | 203 'host/mac/me2me_preference_pane_confirm_pin.mm', |
| 212 'host/mac/me2me_preference_pane_disable.h', | 204 'host/mac/me2me_preference_pane_disable.h', |
| 213 'host/mac/me2me_preference_pane_disable.mm', | 205 'host/mac/me2me_preference_pane_disable.mm', |
| 214 ], | 206 ], |
| 215 'link_settings': { | 207 'link_settings': { |
| 216 'libraries': [ | 208 'libraries': [ |
| 217 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', | 209 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', |
| 218 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', | 210 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', |
| 219 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', | 211 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', |
| 220 '$(SDKROOT)/System/Library/Frameworks/Security.framework', | 212 '$(SDKROOT)/System/Library/Frameworks/Security.framework', |
| 221 ], | 213 ], |
| 222 }, | 214 }, |
| 223 'xcode_settings': { | 215 'xcode_settings': { |
| 224 'ARCHS': ['i386', 'x86_64'], | 216 'ARCHS': ['i386', 'x86_64'], |
|
Sergey Ulanov
2015/12/27 01:21:15
Remove this line
tfarina
2015/12/27 21:22:30
Thanks Sergey! After removing this, remoting_host_
| |
| 225 'GCC_ENABLE_OBJC_GC': 'supported', | 217 'GCC_ENABLE_OBJC_GC': 'supported', |
| 226 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', | 218 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', |
| 227 'INFOPLIST_PREPROCESS': 'YES', | 219 'INFOPLIST_PREPROCESS': 'YES', |
| 228 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VE RSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"', | 220 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VE RSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"', |
| 229 }, | 221 }, |
| 230 'mac_bundle_resources': [ | 222 'mac_bundle_resources': [ |
| 231 'host/mac/me2me_preference_pane.xib', | 223 'host/mac/me2me_preference_pane.xib', |
| 232 'host/mac/me2me_preference_pane_confirm_pin.xib', | 224 'host/mac/me2me_preference_pane_confirm_pin.xib', |
| 233 'host/mac/me2me_preference_pane_disable.xib', | 225 'host/mac/me2me_preference_pane_disable.xib', |
| 234 'host/mac/me2me_preference_pane-Info.plist', | 226 'host/mac/me2me_preference_pane-Info.plist', |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 247 'variables': { | 239 'variables': { |
| 248 # A real .dSYM is needed for dump_syms to operate on. | 240 # A real .dSYM is needed for dump_syms to operate on. |
| 249 'mac_real_dsym': 1, | 241 'mac_real_dsym': 1, |
| 250 }, | 242 }, |
| 251 }], # 'mac_breakpad==1' | 243 }], # 'mac_breakpad==1' |
| 252 ], # conditions | 244 ], # conditions |
| 253 }, # end of target 'remoting_host_prefpane' | 245 }, # end of target 'remoting_host_prefpane' |
| 254 ], # end of 'targets' | 246 ], # end of 'targets' |
| 255 | 247 |
| 256 } | 248 } |
| OLD | NEW |