Skip to content

Commit

Permalink
lacros: Renamed build/lacros_buildflags.h to build/chromeos_buildflags.h
Browse files Browse the repository at this point in the history
In order to migrate it with chromeos/chromeos_buildflags.h.

BUG=1114198
TEST=Build locally. Ran tryjob.

Change-Id: Idbec0af0b6dbcc95f0758494c1e4800980782855
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377169
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: David Bertoni <dbertoni@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804252}
  • Loading branch information
Hidehiko Abe authored and Commit Bot committed Sep 3, 2020
1 parent 3e32429 commit 7c68f58
Show file tree
Hide file tree
Showing 77 changed files with 83 additions and 83 deletions.
6 changes: 3 additions & 3 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ component("base") {
"//base/third_party/double_conversion",
"//base/third_party/dynamic_annotations",
"//build:branding_buildflags",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//third_party/modp_b64",
]

Expand Down Expand Up @@ -2324,7 +2324,7 @@ static_library("base_static") {
"base_switches.h",
]

deps = [ "//build:lacros_buildflags" ]
deps = [ "//build:chromeos_buildflags" ]

if (is_win) {
sources += [
Expand Down Expand Up @@ -2948,7 +2948,7 @@ test("base_unittests") {
"//base/test:run_all_base_unittests",
"//base/test:test_support",
"//base/third_party/dynamic_annotations",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//testing/gmock",
"//testing/gtest",
"//third_party/icu",
Expand Down
2 changes: 1 addition & 1 deletion base/base_switches.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define BASE_BASE_SWITCHES_H_

#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace switches {

Expand Down
2 changes: 1 addition & 1 deletion base/files/file_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/threading/scoped_blocking_call.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

#if defined(OS_ANDROID)
#include "base/os_compat_android.h"
Expand Down
2 changes: 1 addition & 1 deletion base/files/file_util_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "base/time/time.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

#if defined(OS_APPLE)
#include <AvailabilityMacros.h>
Expand Down
2 changes: 1 addition & 1 deletion base/files/file_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
#include "testing/platform_test.h"
Expand Down
2 changes: 1 addition & 1 deletion base/process/kill.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "base/process/process_handle.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace base {

Expand Down
2 changes: 1 addition & 1 deletion base/process/kill_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "base/task/post_task.h"
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace base {

Expand Down
2 changes: 1 addition & 1 deletion base/process/process.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/process/process_handle.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

#if defined(OS_WIN)
#include "base/win/scoped_handle.h"
Expand Down
2 changes: 1 addition & 1 deletion base/process/process_linux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_restrictions.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace base {

Expand Down
2 changes: 1 addition & 1 deletion base/process/process_metrics.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "base/time/time.h"
#include "base/values.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

#if defined(OS_APPLE)
#include <mach/mach.h>
Expand Down
2 changes: 1 addition & 1 deletion base/process/process_metrics_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "base/test/multiprocess_test.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"

Expand Down
2 changes: 1 addition & 1 deletion base/process/process_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_local.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"

Expand Down
2 changes: 1 addition & 1 deletion base/process/process_util_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "base/threading/simple_thread.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"

Expand Down
2 changes: 1 addition & 1 deletion base/system/sys_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "base/task_runner_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace base {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion base/system/sys_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace base {

Expand Down
2 changes: 1 addition & 1 deletion base/system/sys_info_linux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "base/strings/string_util.h"
#include "base/system/sys_info_internal.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion base/system/sys_info_posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "base/system/sys_info_internal.h"
#include "base/threading/scoped_blocking_call.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

#if defined(OS_ANDROID)
#include <sys/vfs.h>
Expand Down
2 changes: 1 addition & 1 deletion base/system/sys_info_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "base/threading/platform_thread.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest-death-test.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
Expand Down
4 changes: 2 additions & 2 deletions build/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ buildflag_header("chromecast_buildflags") {
flags = [ "IS_CHROMECAST=$is_chromecast" ]
}

buildflag_header("lacros_buildflags") {
header = "lacros_buildflags.h"
buildflag_header("chromeos_buildflags") {
header = "chromeos_buildflags.h"

flags = [ "IS_LACROS=$chromeos_is_browser_only" ]
}
2 changes: 1 addition & 1 deletion chrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ if (is_win) {
deps = [
":browser_dependencies",
":child_dependencies",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//chrome/app:command_ids",
"//chrome/common:buildflags",
"//chrome/common/profiler",
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static_library("test_support") {

deps = [
"//base",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//chrome/app:shutdown_signal_handlers",
"//chrome/browser",
"//chrome/browser/policy:path_parser",
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/chrome_crash_reporter_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "base/strings/utf_string_conversions.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_paths_internal.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/chrome_main_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/startup_data.h"
#include "chrome/common/chrome_content_client.h"
#include "content/public/app/content_main_delegate.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1866,7 +1866,7 @@ static_library("browser") {
"//base/util/memory_pressure:memory_pressure",
"//base/util/values:values_util",
"//build:branding_buildflags",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//cc",
"//chrome:extra_resources",
"//chrome:resources",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chrome_browser_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "base/values.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "cc/base/switches.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chrome_content_browser_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/accessibility/caption_util.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/devtools/devtools_ui_bindings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "base/task/post_task.h"
#include "base/values.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/devtools/devtools_file_watcher.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ static_library("extensions") {
"//apps",
"//base/util/values:values_util",
"//build:branding_buildflags",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_PLATFORM_KEYS_ENTERPRISE_PLATFORM_KEYS_API_H_
#define CHROME_BROWSER_EXTENSIONS_API_ENTERPRISE_PLATFORM_KEYS_ENTERPRISE_PLATFORM_KEYS_API_H_

#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

#if BUILDFLAG(IS_LACROS)
#include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_lacros.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <memory>

#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.h"
#include "chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h"
#include "chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/test/test_timeouts.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/memory/oom_memory_details.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "base/process/process_metrics.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/memory/oom_memory_details.h"
#include "ui/base/text/bytes_formatting.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/metrics/chrome_metrics_service_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/google/google_brand.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <memory>

#include "base/callback_list.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/notifications/notification_display_service_factory.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/prefs/session_startup_pref.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "base/values.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/ui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,7 @@ static_library("ui") {
]
deps += [
"//base/util/values:values_util",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//chrome/app/vector_icons",
"//chrome/browser:theme_properties",
"//chrome/browser/media/kaleidoscope/mojom",
Expand Down Expand Up @@ -2524,7 +2524,7 @@ static_library("ui") {
"//ash/public/cpp/resources:ash_public_unscaled_resources",
"//ash/public/cpp/vector_icons",
"//ash/shortcut_viewer",
"//build:lacros_buildflags",
"//build:chromeos_buildflags",
"//chrome/app:generated_resources",
"//chrome/browser/chromeos",
"//chrome/browser/chromeos:backdrop_wallpaper_proto",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/sad_tab.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/time/time.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/net/referrer.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/sad_tab_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_SAD_TAB_TYPES_H_

#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"

enum SadTabKind {
SAD_TAB_KIND_CRASHED, // Tab crashed.
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/tabs/tab_renderer_data.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "base/process/kill.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/favicon/favicon_utils.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_ui_helper.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/window_sizer/window_sizer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/numerics/ranges.h"
#include "build/build_config.h"
#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/window_sizer/window_sizer_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <utility>

#include "build/lacros_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
Expand Down
Loading

0 comments on commit 7c68f58

Please sign in to comment.