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

Unified Diff: components/BUILD.gn

Issue 1944943003: [Mac/GN] Start running components_unittests, components_browsertests, and unit_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pain and suffering, aka having two build systems Created 4 years, 7 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
Index: components/BUILD.gn
diff --git a/components/BUILD.gn b/components/BUILD.gn
index c2c4a0385afffefc3e70b9daabe3e867881a0b4e..f5687bce06bf349dc345c15d425cdfadf15308fd 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -15,7 +15,7 @@ if (is_ios) {
import("//ios/build/config.gni")
}
-if (is_ios || is_mac) {
+if (is_ios) {
bundle_data("components_tests_pak_bundle_data") {
public_deps = [
":components_tests_pak",
@@ -205,10 +205,15 @@ test("components_unittests") {
]
} # iOS/!iOS
- if (is_ios || is_mac) {
+ if (is_ios) {
deps += [ ":components_tests_pak_bundle_data" ]
}
+ if (is_mac) {
+ deps += [ "//content/shell:pak" ]
+ data += [ "$root_out_dir/content_shell.pak" ]
+ }
+
if (is_android) {
deps += [
"//components/gcm_driver/instance_id:test_support",
@@ -417,6 +422,7 @@ if (!is_ios) {
if (is_mac) {
data += [ "$root_out_dir/Content Shell.app/" ]
+ deps += [ "//content/shell:content_shell" ]
Dirk Pranke 2016/05/05 22:59:15 Is this really deps (i.e., components_browsertests
Robert Sesek 2016/05/06 20:52:25 No, it's not really a link deps. But specifying da
Dirk Pranke 2016/05/06 20:56:34 It should; it would be a rather severe bug if it d
Robert Sesek 2016/05/06 22:11:04 Do'h. I built the wrong target--I thought this was
}
if (is_android) {

Powered by Google App Engine
This is Rietveld 408576698