Commit 068bf544 authored by Trent Apted's avatar Trent Apted Committed by Commit Bot

Move sample_system_web_app deps out of official builds.

Since r790679 their presence triggers a gn assert failure on official bots.

Tbr: dominicschulz@google.com
Bug: 1108151
Change-Id: I55cb7dd479f7e9e83fce590811f707d43c0bbdbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2310018Reviewed-by: default avatarTrent Apted <tapted@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790707}
parent e90fcdf4
......@@ -113,7 +113,6 @@ source_set("chromeos") {
"//chromeos/components/print_management/mojom",
"//chromeos/components/proximity_auth",
"//chromeos/components/quick_answers/public/cpp:prefs",
"//chromeos/components/sample_system_web_app_ui:sample_system_web_app_ui",
"//chromeos/components/smbfs",
"//chromeos/components/smbfs/mojom",
"//chromeos/components/string_matching",
......@@ -169,7 +168,6 @@ source_set("chromeos") {
"//chromeos/login/login_state",
"//chromeos/login/session",
"//chromeos/network",
"//chromeos/resources:sample_system_web_app_resources_grit",
"//chromeos/services/assistant/public/cpp",
"//chromeos/services/cros_healthd/public/cpp",
"//chromeos/services/cros_healthd/public/mojom",
......@@ -2565,8 +2563,6 @@ source_set("chromeos") {
"web_applications/crosh_loader_factory.cc",
"web_applications/crosh_loader_factory.h",
"web_applications/default_web_app_ids.h",
"web_applications/sample_system_web_app_info.cc",
"web_applications/sample_system_web_app_info.h",
"web_applications/system_web_app_install_utils.cc",
"web_applications/system_web_app_install_utils.h",
"web_applications/terminal_source.cc",
......@@ -2716,6 +2712,17 @@ source_set("chromeos") {
]
}
if (!is_official_build) {
deps += [
"//chromeos/components/sample_system_web_app_ui:sample_system_web_app_ui",
"//chromeos/resources:sample_system_web_app_resources_grit",
]
sources += [
"web_applications/sample_system_web_app_info.cc",
"web_applications/sample_system_web_app_info.h",
]
}
defines = []
if (use_cras) {
defines += [ "USE_CRAS" ]
......
......@@ -46,7 +46,6 @@
#include "base/values.h"
#include "chrome/browser/chromeos/policy/system_features_disable_list_policy_handler.h"
#include "chrome/browser/chromeos/web_applications/default_web_app_ids.h"
#include "chrome/browser/chromeos/web_applications/sample_system_web_app_info.h"
#include "chrome/browser/chromeos/web_applications/terminal_source.h"
#include "chromeos/components/help_app_ui/url_constants.h"
#include "chromeos/components/media_app_ui/url_constants.h"
......@@ -54,6 +53,11 @@
#include "chromeos/strings/grit/chromeos_strings.h"
#include "components/policy/core/common/policy_pref_names.h"
#include "extensions/common/constants.h"
#if !defined(OFFICIAL_BUILD)
#include "chrome/browser/chromeos/web_applications/sample_system_web_app_info.h"
#endif // !defined(OFFICIAL_BUILD)
#endif // defined(OS_CHROMEOS)
namespace web_app {
......
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