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

Side by Side Diff: third_party/libjingle_xmpp/BUILD.gn

Issue 2648063002: Remove unneeded #defines from libjingle_xmpp. (Closed)
Patch Set: Also remove "FEATURE_ENABLE_VOICEMAIL" Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « jingle/glue/chrome_async_socket.h ('k') | third_party/libjingle_xmpp/xmpp/asyncsocket.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 # TODO(kjellander): Remove remaining dependencies on the WebRTC codebase. 5 # TODO(kjellander): Remove remaining dependencies on the WebRTC codebase.
6 import("../webrtc/build/webrtc.gni") 6 import("../webrtc/build/webrtc.gni")
7 7
8 group("libjingle_xmpp") { 8 group("libjingle_xmpp") {
9 public_deps = [ 9 public_deps = [
10 ":rtc_xmllite", 10 ":rtc_xmllite",
(...skipping 29 matching lines...) Expand all
40 40
41 config("rtc_xmpp_warnings_config") { 41 config("rtc_xmpp_warnings_config") {
42 # GN orders flags on a target before flags from configs. The default config 42 # GN orders flags on a target before flags from configs. The default config
43 # adds these flags so to cancel them out they need to come from a config and 43 # adds these flags so to cancel them out they need to come from a config and
44 # cannot be on the target directly. 44 # cannot be on the target directly.
45 if (is_android) { 45 if (is_android) {
46 cflags = [ "-Wno-error" ] 46 cflags = [ "-Wno-error" ]
47 } 47 }
48 } 48 }
49 49
50 config("rtc_xmpp_inherited_config") {
51 defines = [
52 "FEATURE_ENABLE_SSL",
53 "FEATURE_ENABLE_VOICEMAIL",
54 ]
55 }
56
57 rtc_static_library("rtc_xmpp") { 50 rtc_static_library("rtc_xmpp") {
58 cflags = [] 51 cflags = []
59 sources = [ 52 sources = [
60 "xmpp/asyncsocket.h", 53 "xmpp/asyncsocket.h",
61 "xmpp/constants.cc", 54 "xmpp/constants.cc",
62 "xmpp/constants.h", 55 "xmpp/constants.h",
63 "xmpp/jid.cc", 56 "xmpp/jid.cc",
64 "xmpp/jid.h", 57 "xmpp/jid.h",
65 "xmpp/plainsaslhandler.h", 58 "xmpp/plainsaslhandler.h",
66 "xmpp/prexmppauth.h", 59 "xmpp/prexmppauth.h",
(...skipping 10 matching lines...) Expand all
77 "xmpp/xmppengineimpl.h", 70 "xmpp/xmppengineimpl.h",
78 "xmpp/xmppengineimpl_iq.cc", 71 "xmpp/xmppengineimpl_iq.cc",
79 "xmpp/xmpplogintask.cc", 72 "xmpp/xmpplogintask.cc",
80 "xmpp/xmpplogintask.h", 73 "xmpp/xmpplogintask.h",
81 "xmpp/xmppstanzaparser.cc", 74 "xmpp/xmppstanzaparser.cc",
82 "xmpp/xmppstanzaparser.h", 75 "xmpp/xmppstanzaparser.h",
83 "xmpp/xmpptask.cc", 76 "xmpp/xmpptask.cc",
84 "xmpp/xmpptask.h", 77 "xmpp/xmpptask.h",
85 ] 78 ]
86 79
87 defines = [ "FEATURE_ENABLE_SSL" ] 80 defines = []
88 81
89 deps = [ 82 deps = [
90 ":rtc_xmllite", 83 ":rtc_xmllite",
91 "//third_party/webrtc/base:rtc_base", 84 "//third_party/webrtc/base:rtc_base",
92 ] 85 ]
93 public_deps = [ 86 public_deps = [
94 "//third_party/expat", 87 "//third_party/expat",
95 ] 88 ]
96 configs += [ ":rtc_xmpp_warnings_config" ] 89 configs += [ ":rtc_xmpp_warnings_config" ]
97 90
98 public_configs = [ ":rtc_xmpp_inherited_config" ]
99
100 if (is_nacl) { 91 if (is_nacl) {
101 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 92 deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
102 } 93 }
103 94
104 if (is_posix && is_debug) { 95 if (is_posix && is_debug) {
105 # The Chromium configs defines this for all posix _except_ for ios & mac. 96 # The Chromium configs defines this for all posix _except_ for ios & mac.
106 # We want it there as well, e.g. because ASSERT and friends trigger off of 97 # We want it there as well, e.g. because ASSERT and friends trigger off of
107 # it. 98 # it.
108 defines += [ "_DEBUG" ] 99 defines += [ "_DEBUG" ]
109 } 100 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 "xmllite/xmlprinter_unittest.cc", 135 "xmllite/xmlprinter_unittest.cc",
145 "xmpp/fakexmppclient.h", 136 "xmpp/fakexmppclient.h",
146 "xmpp/jid_unittest.cc", 137 "xmpp/jid_unittest.cc",
147 "xmpp/util_unittest.cc", 138 "xmpp/util_unittest.cc",
148 "xmpp/util_unittest.h", 139 "xmpp/util_unittest.h",
149 "xmpp/xmppengine_unittest.cc", 140 "xmpp/xmppengine_unittest.cc",
150 "xmpp/xmpplogintask_unittest.cc", 141 "xmpp/xmpplogintask_unittest.cc",
151 "xmpp/xmppstanzaparser_unittest.cc", 142 "xmpp/xmppstanzaparser_unittest.cc",
152 ] 143 ]
153 } 144 }
OLDNEW
« no previous file with comments | « jingle/glue/chrome_async_socket.h ('k') | third_party/libjingle_xmpp/xmpp/asyncsocket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698