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

Unified Diff: cloud_print/service/BUILD.gn

Issue 1407623003: Revert of Add cloud_print to the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « cloud_print/common/common.gyp ('k') | cloud_print/service/service.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/service/BUILD.gn
diff --git a/cloud_print/service/BUILD.gn b/cloud_print/service/BUILD.gn
index 172a71e374c9a083d407b0ace98215e33045b27b..7baf63b6306a98617d15343d49a704d2d5efc7c6 100644
--- a/cloud_print/service/BUILD.gn
+++ b/cloud_print/service/BUILD.gn
@@ -2,34 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//build/config/features.gni")
import("//tools/grit/grit_rule.gni")
-config("internal_config") {
- defines = [
- "SECURITY_WIN32",
- "STRICT",
- "_ATL_APARTMENT_THREADED",
- "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS",
- "_ATL_NO_COM_SUPPORT",
- "_ATL_NO_AUTOMATIC_NAMESPACE",
- "_ATL_NO_EXCEPTIONS",
- ]
-}
-
-if (is_win && is_clang) {
- # service_controller.h uses DECLARE_REGISTRY_APPID_RESOURCEID, which
- # in msvs2013 returns string literals via a non-const pointer. So
- # disable this warning for now.
- # TODO(thakis): Remove this once we're on 2014,
- # https://connect.microsoft.com/VisualStudio/feedback/details/806376/atl-hindrances-to-adopting-new-strictstrings-conformance-option-in-vs2013
- config("service_warning_config") {
- cflags = [ "-Wno-writable-strings" ]
- }
-}
-
-source_set("lib") {
+source_set("cloud_print_service_lib") {
sources = [
+ "//cloud_print/common/win/cloud_print_utils.cc",
+ "//cloud_print/common/win/cloud_print_utils.h",
"service_constants.cc",
"service_constants.h",
"service_state.cc",
@@ -50,46 +28,24 @@
"win/setup_listener.h",
]
- configs += [
- ":internal_config",
- "//build/config/compiler:wexit_time_destructors",
- ]
-
deps = [
- ":resources",
+ ":service_resources",
"//base",
"//base:base_static",
"//base/third_party/dynamic_annotations",
- "//chrome/common:constants",
- "//cloud_print/common",
- "//components/cloud_devices/common",
- "//content/public/common:static_switches",
+ "//content/public/common",
"//google_apis",
"//ipc",
"//net",
"//url",
]
- if (enable_basic_printing || enable_print_preview) {
- deps += [ "//printing" ]
- }
-
- if (is_win) {
- deps += [
- "//chrome/common:constants",
- "//chrome/installer/launcher_support",
- ]
- }
-
if (is_clang) {
cflags = [ "-Wno-parentheses" ]
- if (is_win) {
- public_configs = [ ":service_warning_config" ]
- }
}
}
-grit("resources") {
+grit("service_resources") {
source = "win/service_resources.grd"
outputs = [
"resources.h",
« no previous file with comments | « cloud_print/common/common.gyp ('k') | cloud_print/service/service.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698