| 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") | 
| 6 | 6 | 
| 7 if (enable_webrtc || !is_android) { | 7 if (enable_webrtc || !is_android) { | 
| 8   jingle_includes = exec_script("//build/gypi_to_gn.py", | 8   jingle_includes = exec_script("//build/gypi_to_gn.py", | 
| 9                                 [ rebase_path("jingle.gypi") ], | 9                                 [ rebase_path("jingle.gypi") ], | 
| 10                                 "scope", | 10                                 "scope", | 
| 11                                 [ "jingle.gypi" ]) | 11                                 [ "jingle.gypi" ]) | 
| 12 | 12 | 
| 13   # GYP version: jingle/jingle.gyp:jingle_glue | 13   # GYP version: jingle/jingle.gyp:jingle_glue | 
| 14   static_library("jingle_glue") { | 14   static_library("jingle_glue") { | 
| 15     sources = jingle_includes.jingle_glue_sources | 15     sources = jingle_includes.jingle_glue_sources | 
|  | 16     public_deps = [ | 
|  | 17       "//third_party/libjingle", | 
|  | 18     ] | 
| 16     deps = [ | 19     deps = [ | 
| 17       "//base", | 20       "//base", | 
| 18       "//base/third_party/dynamic_annotations", | 21       "//base/third_party/dynamic_annotations", | 
| 19       "//net", | 22       "//net", | 
| 20       "//third_party/libjingle", |  | 
| 21     ] | 23     ] | 
| 22     forward_dependent_configs_from = [ "//third_party/libjingle" ] |  | 
| 23   } | 24   } | 
| 24 | 25 | 
| 25   # A library for sending and receiving peer-issued notifications. | 26   # A library for sending and receiving peer-issued notifications. | 
| 26   # GYP version: jingle/jingle.gyp:notifier | 27   # GYP version: jingle/jingle.gyp:notifier | 
| 27   static_library("notifier") { | 28   static_library("notifier") { | 
| 28     sources = [ | 29     sources = [ | 
| 29       "notifier/base/const_communicator.h", | 30       "notifier/base/const_communicator.h", | 
| 30       "notifier/base/gaia_constants.cc", | 31       "notifier/base/gaia_constants.cc", | 
| 31       "notifier/base/gaia_constants.h", | 32       "notifier/base/gaia_constants.h", | 
| 32       "notifier/base/gaia_token_pre_xmpp_auth.cc", | 33       "notifier/base/gaia_token_pre_xmpp_auth.cc", | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 70       "notifier/listener/send_ping_task.cc", | 71       "notifier/listener/send_ping_task.cc", | 
| 71       "notifier/listener/send_ping_task.h", | 72       "notifier/listener/send_ping_task.h", | 
| 72       "notifier/listener/xml_element_util.cc", | 73       "notifier/listener/xml_element_util.cc", | 
| 73       "notifier/listener/xml_element_util.h", | 74       "notifier/listener/xml_element_util.h", | 
| 74       "notifier/listener/xmpp_push_client.cc", | 75       "notifier/listener/xmpp_push_client.cc", | 
| 75       "notifier/listener/xmpp_push_client.h", | 76       "notifier/listener/xmpp_push_client.h", | 
| 76     ] | 77     ] | 
| 77     defines = [ | 78     defines = [ | 
| 78      "_CRT_SECURE_NO_WARNINGS", | 79      "_CRT_SECURE_NO_WARNINGS", | 
| 79     ] | 80     ] | 
|  | 81 | 
|  | 82     public_deps = [ | 
|  | 83       "//third_party/libjingle", | 
|  | 84     ] | 
| 80     deps = [ | 85     deps = [ | 
| 81       "//base", | 86       "//base", | 
| 82       "//net", | 87       "//net", | 
| 83       "//third_party/expat", | 88       "//third_party/expat", | 
| 84       "//url", | 89       "//url", | 
| 85       ":jingle_glue", | 90       ":jingle_glue", | 
| 86       "//third_party/libjingle", |  | 
| 87     ] | 91     ] | 
| 88     forward_dependent_configs_from = [ "//third_party/libjingle" ] |  | 
| 89   } | 92   } | 
| 90 | 93 | 
| 91   # GYP version: jingle/jingle.gyp:notifier_test_util | 94   # GYP version: jingle/jingle.gyp:notifier_test_util | 
| 92   static_library("notifier_test_util") { | 95   static_library("notifier_test_util") { | 
| 93     testonly = true | 96     testonly = true | 
| 94     sources = [ | 97     sources = [ | 
| 95       "notifier/base/fake_base_task.cc", | 98       "notifier/base/fake_base_task.cc", | 
| 96       "notifier/base/fake_base_task.h", | 99       "notifier/base/fake_base_task.h", | 
| 97       "notifier/listener/fake_push_client.cc", | 100       "notifier/listener/fake_push_client.cc", | 
| 98       "notifier/listener/fake_push_client.h", | 101       "notifier/listener/fake_push_client.h", | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 141     if (is_android) { | 144     if (is_android) { | 
| 142       sources -= [ | 145       sources -= [ | 
| 143         # TODO(jrg): | 146         # TODO(jrg): | 
| 144         # EXPECT_DEBUG_DEATH() uses features not enabled. | 147         # EXPECT_DEBUG_DEATH() uses features not enabled. | 
| 145         # Should we -std=c++0x or -std=gnu++0x? | 148         # Should we -std=c++0x or -std=gnu++0x? | 
| 146         "glue/chrome_async_socket_unittest.cc", | 149         "glue/chrome_async_socket_unittest.cc", | 
| 147         "notifier/base/xmpp_connection_unittest.cc", | 150         "notifier/base/xmpp_connection_unittest.cc", | 
| 148       ] | 151       ] | 
| 149     } | 152     } | 
| 150 | 153 | 
|  | 154     public_deps = [ | 
|  | 155       "//third_party/libjingle", | 
|  | 156     ] | 
| 151     deps = [ | 157     deps = [ | 
| 152       ":jingle_glue", | 158       ":jingle_glue", | 
| 153       ":notifier", | 159       ":notifier", | 
| 154       ":notifier_test_util", | 160       ":notifier_test_util", | 
| 155       "//base", | 161       "//base", | 
| 156       "//base/test:run_all_unittests", | 162       "//base/test:run_all_unittests", | 
| 157       "//base/test:test_support", | 163       "//base/test:test_support", | 
| 158       "//net", | 164       "//net", | 
| 159       "//net:test_support", | 165       "//net:test_support", | 
| 160       "//testing/gmock", | 166       "//testing/gmock", | 
| 161       "//testing/gtest", | 167       "//testing/gtest", | 
| 162       "//third_party/libjingle", |  | 
| 163     ] | 168     ] | 
| 164     forward_dependent_configs_from = [ "//third_party/libjingle" ] |  | 
| 165   } | 169   } | 
| 166 } else { | 170 } else { | 
| 167   # !enable_webrtc and is_android | 171   # !enable_webrtc and is_android | 
| 168   # Stub targets as Android doesn't use libjingle when webrtc is disabled. | 172   # Stub targets as Android doesn't use libjingle when webrtc is disabled. | 
| 169   source_set("jingle_glue") { } | 173   source_set("jingle_glue") { } | 
| 170 | 174 | 
| 171   source_set("jingle_glue_test_util") { } | 175   source_set("jingle_glue_test_util") { } | 
| 172 | 176 | 
| 173   # GYP version: jingle/jingle.gyp:notifier | 177   # GYP version: jingle/jingle.gyp:notifier | 
| 174   static_library("notifier") { | 178   static_library("notifier") { | 
| 175     sources = [ | 179     sources = [ | 
| 176       "notifier/base/gaia_constants.cc", | 180       "notifier/base/gaia_constants.cc", | 
| 177       "notifier/base/gaia_constants.h", | 181       "notifier/base/gaia_constants.h", | 
| 178       "notifier/base/notification_method.h", | 182       "notifier/base/notification_method.h", | 
| 179       "notifier/base/notification_method.cc", | 183       "notifier/base/notification_method.cc", | 
| 180       "notifier/base/notifier_options.cc", | 184       "notifier/base/notifier_options.cc", | 
| 181       "notifier/base/notifier_options.h", | 185       "notifier/base/notifier_options.h", | 
| 182     ] | 186     ] | 
| 183     deps = [ | 187     deps = [ | 
| 184       "//base", | 188       "//base", | 
| 185       "//net" | 189       "//net" | 
| 186     ] | 190     ] | 
| 187   } | 191   } | 
| 188 | 192 | 
| 189   source_set("notifier_test_util") { } | 193   source_set("notifier_test_util") { } | 
| 190 } | 194 } | 
| OLD | NEW | 
|---|