Commit 9c499c22 authored by Hidehiko Abe's avatar Hidehiko Abe Committed by Commit Bot

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: default avatarJames Cook <jamescook@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804308}
parent a3541d1c
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
import("//build/buildflag_header.gni") import("//build/buildflag_header.gni")
import("//build/config/chrome_build.gni") import("//build/config/chrome_build.gni")
import("//build/config/chromecast_build.gni") import("//build/config/chromecast_build.gni")
import("//build/config/chromeos/args.gni")
import("//build/config/chromeos/ui_mode.gni") import("//build/config/chromeos/ui_mode.gni")
source_set("buildflag_header_h") { source_set("buildflag_header_h") {
...@@ -36,5 +37,8 @@ buildflag_header("chromecast_buildflags") { ...@@ -36,5 +37,8 @@ buildflag_header("chromecast_buildflags") {
buildflag_header("chromeos_buildflags") { buildflag_header("chromeos_buildflags") {
header = "chromeos_buildflags.h" header = "chromeos_buildflags.h"
flags = [ "IS_LACROS=$chromeos_is_browser_only" ] flags = [
"IS_CHROMEOS_DEVICE=$is_chromeos_device",
"IS_LACROS=$chromeos_is_browser_only",
]
} }
...@@ -164,6 +164,7 @@ test("chromeos_unittests") { ...@@ -164,6 +164,7 @@ test("chromeos_unittests") {
":chromeos_buildflags", ":chromeos_buildflags",
":test_support", ":test_support",
"//base/test:test_support", "//base/test:test_support",
"//build:chromeos_buildflags",
"//chromeos/attestation:unit_tests", "//chromeos/attestation:unit_tests",
"//chromeos/audio:unit_tests", "//chromeos/audio:unit_tests",
"//chromeos/cryptohome:unit_tests", "//chromeos/cryptohome:unit_tests",
......
...@@ -14,7 +14,7 @@ test("chromeos_components_unittests") { ...@@ -14,7 +14,7 @@ test("chromeos_components_unittests") {
deps = [ deps = [
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//chromeos:chromeos_buildflags", "//build:chromeos_buildflags",
"//chromeos/components/account_manager:unit_tests", "//chromeos/components/account_manager:unit_tests",
"//chromeos/components/bloom:unit_tests", "//chromeos/components/bloom:unit_tests",
"//chromeos/components/cdm_factory_daemon:unit_tests", "//chromeos/components/cdm_factory_daemon:unit_tests",
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h" #include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h" #include "base/test/test_suite.h"
#include "chromeos/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
#include "mojo/core/embedder/embedder.h" #include "mojo/core/embedder/embedder.h"
#if BUILDFLAG(IS_CHROMEOS_DEVICE) #if BUILDFLAG(IS_CHROMEOS_DEVICE)
......
...@@ -51,7 +51,7 @@ source_set("unit_tests") { ...@@ -51,7 +51,7 @@ source_set("unit_tests") {
":memory", ":memory",
"//base/test:test_support", "//base/test:test_support",
"//base/util/memory_pressure", "//base/util/memory_pressure",
"//chromeos:chromeos_buildflags", "//build:chromeos_buildflags",
"//mojo/core/embedder", "//mojo/core/embedder",
"//services/resource_coordinator/public/cpp/memory_instrumentation", "//services/resource_coordinator/public/cpp/memory_instrumentation",
"//testing/gmock", "//testing/gmock",
......
...@@ -60,7 +60,7 @@ source_set("unit_tests") { ...@@ -60,7 +60,7 @@ source_set("unit_tests") {
":mojom", ":mojom",
":userspace_swap", ":userspace_swap",
"//base/test:test_support", "//base/test:test_support",
"//chromeos:chromeos_buildflags", "//build:chromeos_buildflags",
"//mojo/core/embedder", "//mojo/core/embedder",
"//services/resource_coordinator/public/cpp/memory_instrumentation", "//services/resource_coordinator/public/cpp/memory_instrumentation",
"//testing/gmock", "//testing/gmock",
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/test/launcher/unit_test_launcher.h" #include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h" #include "base/test/test_suite.h"
#include "chromeos/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
#include "mojo/core/embedder/embedder.h" #include "mojo/core/embedder/embedder.h"
#if BUILDFLAG(IS_CHROMEOS_DEVICE) #if BUILDFLAG(IS_CHROMEOS_DEVICE)
......
...@@ -41,7 +41,7 @@ test("ui_chromeos_unittests") { ...@@ -41,7 +41,7 @@ test("ui_chromeos_unittests") {
deps = [ deps = [
":chromeos", ":chromeos",
"//base/test:test_support", "//base/test:test_support",
"//chromeos:chromeos_buildflags", "//build:chromeos_buildflags",
"//mojo/core/embedder", "//mojo/core/embedder",
"//skia", "//skia",
"//testing/gtest", "//testing/gtest",
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/path_service.h" #include "base/path_service.h"
#include "base/test/launcher/unit_test_launcher.h" #include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h" #include "base/test/test_suite.h"
#include "chromeos/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
#include "mojo/core/embedder/embedder.h" #include "mojo/core/embedder/embedder.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment