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

Unified Diff: remoting/remoting_host_mac.gypi

Issue 1411553005: mac: Let remoting_host_prefpane link with libc++. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: readme Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/jsoncpp/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_host_mac.gypi
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi
index 40f358a961e826254fd2a687e1dbd231a9257152..dce3cf08b6d79024b3c02f0ff5b44dd785a9eb60 100644
--- a/remoting/remoting_host_mac.gypi
+++ b/remoting/remoting_host_mac.gypi
@@ -199,7 +199,7 @@
# Mac OS X 64-bit - http://crbug.com/128122.
'sources': [
'../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
- '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
+ '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp',
'../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
'../third_party/modp_b64/modp_b64.cc',
'host/constants_mac.cc',
@@ -226,14 +226,6 @@
'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist',
'INFOPLIST_PREPROCESS': 'YES',
'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
-
- 'conditions': [
- ['component=="shared_library"', {
- # TODO(thakis): Figure out why this is needed,
- # http://crbug.com/544531
- 'CLANG_CXX_LIBRARY': 'libstdc++', # -stdlib=libstdc++
- }],
- ],
},
'mac_bundle_resources': [
'host/mac/me2me_preference_pane.xib',
« no previous file with comments | « no previous file | third_party/jsoncpp/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698