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

Unified Diff: mojo/services/html_viewer/BUILD.gn

Issue 702003002: Make *some* version of the Mac GN build work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to r303398 (after win gn CL landed) Created 6 years, 1 month 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 | « mojo/services/BUILD.gn ('k') | net/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/BUILD.gn
diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn
index b362140823095b5d41ea23d0e40d706fbd64fb9a..8780ff75a330adc9c4fd4af777f98338e883a102 100644
--- a/mojo/services/html_viewer/BUILD.gn
+++ b/mojo/services/html_viewer/BUILD.gn
@@ -3,73 +3,76 @@
# found in the LICENSE file.
# GYP version: mojo/mojo_services.gypi:html_viewer
-shared_library("html_viewer") {
- sources = [
- "blink_basic_type_converters.cc",
- "blink_basic_type_converters.h",
- "blink_input_events_type_converters.cc",
- "blink_input_events_type_converters.h",
- "blink_platform_impl.cc",
- "blink_platform_impl.h",
- "blink_url_request_type_converters.cc",
- "blink_url_request_type_converters.h",
- "html_viewer.cc",
- "html_document_view.cc",
- "html_document_view.h",
- "webclipboard_impl.cc",
- "webclipboard_impl.h",
- "webcookiejar_impl.cc",
- "webcookiejar_impl.h",
- "webmediaplayer_factory.cc",
- "webmediaplayer_factory.h",
- "webmimeregistry_impl.cc",
- "webmimeregistry_impl.h",
- "websockethandle_impl.cc",
- "websockethandle_impl.h",
- "webstoragenamespace_impl.cc",
- "webstoragenamespace_impl.h",
- "webthemeengine_impl.cc",
- "webthemeengine_impl.h",
- "webthread_impl.cc",
- "webthread_impl.h",
- "weburlloader_impl.cc",
- "weburlloader_impl.h",
- "weblayertreeview_impl.cc",
- "weblayertreeview_impl.h",
- ]
+# TODO(GYP), TODO(dpranke): Make work on the mac.
+if (!is_mac) {
brettw 2014/11/10 07:01:29 If the mac build sees this file at all, then that
Dirk Pranke 2014/11/10 17:46:02 I think I may have commented this out in order to
+ shared_library("html_viewer") {
+ sources = [
+ "blink_basic_type_converters.cc",
+ "blink_basic_type_converters.h",
+ "blink_input_events_type_converters.cc",
+ "blink_input_events_type_converters.h",
+ "blink_platform_impl.cc",
+ "blink_platform_impl.h",
+ "blink_url_request_type_converters.cc",
+ "blink_url_request_type_converters.h",
+ "html_viewer.cc",
+ "html_document_view.cc",
+ "html_document_view.h",
+ "webclipboard_impl.cc",
+ "webclipboard_impl.h",
+ "webcookiejar_impl.cc",
+ "webcookiejar_impl.h",
+ "webmediaplayer_factory.cc",
+ "webmediaplayer_factory.h",
+ "webmimeregistry_impl.cc",
+ "webmimeregistry_impl.h",
+ "websockethandle_impl.cc",
+ "websockethandle_impl.h",
+ "webstoragenamespace_impl.cc",
+ "webstoragenamespace_impl.h",
+ "webthemeengine_impl.cc",
+ "webthemeengine_impl.h",
+ "webthread_impl.cc",
+ "webthread_impl.h",
+ "weburlloader_impl.cc",
+ "weburlloader_impl.h",
+ "weblayertreeview_impl.cc",
+ "weblayertreeview_impl.h",
+ ]
- include_dirs = [ "third_party/WebKit" ]
+ include_dirs = [ "third_party/WebKit" ]
- deps = [
- "//base",
- "//base/third_party/dynamic_annotations",
- "//cc",
- "//cc/blink",
- "//cc/surfaces",
- "//media",
- "//media/blink",
- "//media/mojo",
- "//mojo/application",
- "//mojo/cc",
- "//mojo/common",
- "//mojo/converters/surfaces",
- "//mojo/public/c/system:for_shared_library",
- "//mojo/public/cpp/bindings",
- "//mojo/public/cpp/utility",
- "//mojo/public/interfaces/application",
- "//mojo/services/public/cpp/network",
- "//mojo/services/public/cpp/view_manager",
- "//mojo/services/public/interfaces/clipboard",
- "//mojo/services/public/interfaces/content_handler",
- "//mojo/services/public/interfaces/gpu",
- "//mojo/services/public/interfaces/input_events:input_events",
- "//mojo/services/public/interfaces/navigation",
- "//mojo/services/public/interfaces/network",
- "//mojo/services/public/interfaces/surfaces",
- "//net",
- "//skia",
- "//third_party/WebKit/public:blink",
- "//ui/native_theme",
- "//url",
- ]
+ deps = [
+ "//base",
+ "//base/third_party/dynamic_annotations",
+ "//cc",
+ "//cc/blink",
+ "//cc/surfaces",
+ "//media",
+ "//media/blink",
+ "//media/mojo",
+ "//mojo/application",
+ "//mojo/cc",
+ "//mojo/common",
+ "//mojo/converters/surfaces",
+ "//mojo/public/c/system:for_shared_library",
+ "//mojo/public/cpp/bindings",
+ "//mojo/public/cpp/utility",
+ "//mojo/public/interfaces/application",
+ "//mojo/services/public/cpp/network",
+ "//mojo/services/public/cpp/view_manager",
+ "//mojo/services/public/interfaces/clipboard",
+ "//mojo/services/public/interfaces/content_handler",
+ "//mojo/services/public/interfaces/gpu",
+ "//mojo/services/public/interfaces/input_events:input_events",
+ "//mojo/services/public/interfaces/navigation",
+ "//mojo/services/public/interfaces/network",
+ "//mojo/services/public/interfaces/surfaces",
+ "//net",
+ "//skia",
+ "//third_party/WebKit/public:blink",
+ "//ui/native_theme",
+ "//url",
+ ]
+ }
}
« no previous file with comments | « mojo/services/BUILD.gn ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698