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

Unified Diff: cc/blink/BUILD.gn

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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 | « cc/base/switches.cc ('k') | cc/cc_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/BUILD.gn
diff --git a/cc/blink/BUILD.gn b/cc/blink/BUILD.gn
index 9d4007b5789e2ac6e9c7d86d48b619b04ad6f4b6..1769efba303ac94fd547d3d6e14e115ddc75da8f 100644
--- a/cc/blink/BUILD.gn
+++ b/cc/blink/BUILD.gn
@@ -9,8 +9,8 @@ component("blink") {
output_name = "cc_blink"
sources = [
- "context_provider_web_context.h",
"cc_blink_export.h",
+ "context_provider_web_context.h",
"scrollbar_impl.cc",
"scrollbar_impl.h",
"web_animation_curve_common.cc",
@@ -72,7 +72,7 @@ component("blink") {
# GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests
# TODO(GYP): make linking work on the mac.
-if (!is_mac && (!is_win || link_chrome_on_windows)) {
+if (!is_mac) {
test("cc_blink_unittests") {
sources = [
"web_animation_unittest.cc",
« no previous file with comments | « cc/base/switches.cc ('k') | cc/cc_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698