lacros: Migrate chromeos/chromeos_buildflags.h to build/chromeos_buildflags.h
This CL unifies those two buildflags file for Chrome OS.
BUG=1114198
TEST=Build locally. Ran tryjob.
Change-Id: Id7343da06ac6b17cb20cb20babdd8ab06ac40028
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377525
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804308}
diff --git a/build/BUILD.gn b/build/BUILD.gn
index 83216c1..16f23564 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/buildflag_header.gni")
import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni")
+import("//build/config/chromeos/args.gni")
import("//build/config/chromeos/ui_mode.gni")
source_set("buildflag_header_h") {
@@ -36,5 +37,8 @@
buildflag_header("chromeos_buildflags") {
header = "chromeos_buildflags.h"
- flags = [ "IS_LACROS=$chromeos_is_browser_only" ]
+ flags = [
+ "IS_CHROMEOS_DEVICE=$is_chromeos_device",
+ "IS_LACROS=$chromeos_is_browser_only",
+ ]
}
diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
index bd6176df..9402f87 100644
--- a/chromeos/BUILD.gn
+++ b/chromeos/BUILD.gn
@@ -164,6 +164,7 @@
":chromeos_buildflags",
":test_support",
"//base/test:test_support",
+ "//build:chromeos_buildflags",
"//chromeos/attestation:unit_tests",
"//chromeos/audio:unit_tests",
"//chromeos/cryptohome:unit_tests",
diff --git a/chromeos/components/BUILD.gn b/chromeos/components/BUILD.gn
index 73bffd22..f62034c 100644
--- a/chromeos/components/BUILD.gn
+++ b/chromeos/components/BUILD.gn
@@ -14,7 +14,7 @@
deps = [
"//base",
"//base/test:test_support",
- "//chromeos:chromeos_buildflags",
+ "//build:chromeos_buildflags",
"//chromeos/components/account_manager:unit_tests",
"//chromeos/components/bloom:unit_tests",
"//chromeos/components/cdm_factory_daemon:unit_tests",
diff --git a/chromeos/components/run_all_unittests.cc b/chromeos/components/run_all_unittests.cc
index 98f76a6..437a61964 100644
--- a/chromeos/components/run_all_unittests.cc
+++ b/chromeos/components/run_all_unittests.cc
@@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "chromeos/chromeos_buildflags.h"
+#include "build/chromeos_buildflags.h"
#include "mojo/core/embedder/embedder.h"
#if BUILDFLAG(IS_CHROMEOS_DEVICE)
diff --git a/chromeos/memory/BUILD.gn b/chromeos/memory/BUILD.gn
index 9f2986a6..ece96974 100644
--- a/chromeos/memory/BUILD.gn
+++ b/chromeos/memory/BUILD.gn
@@ -51,7 +51,7 @@
":memory",
"//base/test:test_support",
"//base/util/memory_pressure",
- "//chromeos:chromeos_buildflags",
+ "//build:chromeos_buildflags",
"//mojo/core/embedder",
"//services/resource_coordinator/public/cpp/memory_instrumentation",
"//testing/gmock",
diff --git a/chromeos/memory/userspace_swap/BUILD.gn b/chromeos/memory/userspace_swap/BUILD.gn
index d74bc2fa..a054d419 100644
--- a/chromeos/memory/userspace_swap/BUILD.gn
+++ b/chromeos/memory/userspace_swap/BUILD.gn
@@ -60,7 +60,7 @@
":mojom",
":userspace_swap",
"//base/test:test_support",
- "//chromeos:chromeos_buildflags",
+ "//build:chromeos_buildflags",
"//mojo/core/embedder",
"//services/resource_coordinator/public/cpp/memory_instrumentation",
"//testing/gmock",
diff --git a/chromeos/test/run_all_unittests.cc b/chromeos/test/run_all_unittests.cc
index facaf34..57d1cca 100644
--- a/chromeos/test/run_all_unittests.cc
+++ b/chromeos/test/run_all_unittests.cc
@@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "chromeos/chromeos_buildflags.h"
+#include "build/chromeos_buildflags.h"
#include "mojo/core/embedder/embedder.h"
#if BUILDFLAG(IS_CHROMEOS_DEVICE)
diff --git a/ui/chromeos/BUILD.gn b/ui/chromeos/BUILD.gn
index 55c0a24d..f5bf43b 100644
--- a/ui/chromeos/BUILD.gn
+++ b/ui/chromeos/BUILD.gn
@@ -41,7 +41,7 @@
deps = [
":chromeos",
"//base/test:test_support",
- "//chromeos:chromeos_buildflags",
+ "//build:chromeos_buildflags",
"//mojo/core/embedder",
"//skia",
"//testing/gtest",
diff --git a/ui/chromeos/run_all_unittests.cc b/ui/chromeos/run_all_unittests.cc
index 8d826a6..770f6ce 100644
--- a/ui/chromeos/run_all_unittests.cc
+++ b/ui/chromeos/run_all_unittests.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
-#include "chromeos/chromeos_buildflags.h"
+#include "build/chromeos_buildflags.h"
#include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h"