Remove unused network_diagnostics.mojom-lite.js from CrOS builds.
The component that used these was migrated to JS module Mojo bindings at crrev.com/c/3902119. Bug: 40169715 Change-Id: I5615d65567635f83ab79323feb89c46cf8200572 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6168369 Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org> Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org> Reviewed-by: Denis Kuznetsov <antrim@chromium.org> Cr-Commit-Position: refs/heads/main@{#1405469}
This commit is contained in:
chrome
chromeos/resources
content/browser
tools/gritsettings
@ -335,7 +335,6 @@ template("chrome_extra_paks") {
|
|||||||
"$root_gen_dir/chromeos/chromeos_help_app_kids_magazine_bundle_resources.pak",
|
"$root_gen_dir/chromeos/chromeos_help_app_kids_magazine_bundle_resources.pak",
|
||||||
"$root_gen_dir/chromeos/chromeos_media_app_bundle_resources.pak",
|
"$root_gen_dir/chromeos/chromeos_media_app_bundle_resources.pak",
|
||||||
"$root_gen_dir/chromeos/chromeos_projector_app_bundle_resources.pak",
|
"$root_gen_dir/chromeos/chromeos_projector_app_bundle_resources.pak",
|
||||||
"$root_gen_dir/chromeos/chromeos_resources.pak",
|
|
||||||
"$root_gen_dir/components/arc/input_overlay_resources.pak",
|
"$root_gen_dir/components/arc/input_overlay_resources.pak",
|
||||||
"$root_gen_dir/ui/file_manager/file_manager_gen_resources.pak",
|
"$root_gen_dir/ui/file_manager/file_manager_gen_resources.pak",
|
||||||
"$root_gen_dir/ui/file_manager/file_manager_resources.pak",
|
"$root_gen_dir/ui/file_manager/file_manager_resources.pak",
|
||||||
@ -393,7 +392,6 @@ template("chrome_extra_paks") {
|
|||||||
"//chromeos/ash/components/kiosk/vision/webui:resources",
|
"//chromeos/ash/components/kiosk/vision/webui:resources",
|
||||||
"//chromeos/ash/experiences/arc/input_overlay/resources",
|
"//chromeos/ash/experiences/arc/input_overlay/resources",
|
||||||
"//chromeos/ash/resources",
|
"//chromeos/ash/resources",
|
||||||
"//chromeos/resources",
|
|
||||||
"//ui/chromeos/styles:cros_styles_resources",
|
"//ui/chromeos/styles:cros_styles_resources",
|
||||||
"//ui/file_manager:file_manager_gen_resources",
|
"//ui/file_manager:file_manager_gen_resources",
|
||||||
"//ui/file_manager:resources",
|
"//ui/file_manager:resources",
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
# Copyright 2018 The Chromium Authors
|
|
||||||
# Use of this source code is governed by a BSD-style license that can be
|
|
||||||
# found in the LICENSE file.
|
|
||||||
|
|
||||||
import("//tools/grit/grit_rule.gni")
|
|
||||||
|
|
||||||
assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
|
|
||||||
|
|
||||||
grit("resources") {
|
|
||||||
source = "chromeos_resources.grd"
|
|
||||||
|
|
||||||
outputs = [
|
|
||||||
"grit/chromeos_resources.h",
|
|
||||||
"grit/chromeos_resources_map.cc",
|
|
||||||
"grit/chromeos_resources_map.h",
|
|
||||||
"chromeos_resources.pak",
|
|
||||||
]
|
|
||||||
output_dir = "$root_gen_dir/chromeos"
|
|
||||||
|
|
||||||
grit_flags = [
|
|
||||||
"-E",
|
|
||||||
"mojom_root=" + rebase_path(root_gen_dir, root_build_dir),
|
|
||||||
]
|
|
||||||
|
|
||||||
deps = [
|
|
||||||
# Generated ml service js bindings are required by external clients, the
|
|
||||||
# clients are not found within Chromium. The clients pull the generated
|
|
||||||
# js bindings as part of their build process.
|
|
||||||
"//chromeos/services/machine_learning/public/mojom:mojom_js",
|
|
||||||
"//chromeos/services/network_health/public/mojom:mojom_js",
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
|
|
||||||
<outputs>
|
|
||||||
<output filename="grit/chromeos_resources.h" type="rc_header">
|
|
||||||
<emit emit_type='prepend'></emit>
|
|
||||||
</output>
|
|
||||||
<output filename="grit/chromeos_resources_map.cc"
|
|
||||||
type="resource_file_map_source" />
|
|
||||||
<output filename="grit/chromeos_resources_map.h"
|
|
||||||
type="resource_map_header" />
|
|
||||||
<output filename="chromeos_resources.pak" type="data_package" />
|
|
||||||
</outputs>
|
|
||||||
<release seq="1">
|
|
||||||
<includes>
|
|
||||||
<part file="network_health_resources.grdp" />
|
|
||||||
</includes>
|
|
||||||
</release>
|
|
||||||
</grit>
|
|
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<grit-part>
|
|
||||||
<include name="IDR_NETWORK_DIAGNOSTICS_MOJOM_LITE_JS"
|
|
||||||
file="${mojom_root}/chromeos/services/network_health/public/mojom/network_diagnostics.mojom-lite.js"
|
|
||||||
resource_path="mojo/chromeos/services/network_health/public/mojom/network_diagnostics.mojom-lite.js"
|
|
||||||
use_base_dir="false"
|
|
||||||
type="BINDATA" />
|
|
||||||
</grit-part>
|
|
@ -2599,7 +2599,6 @@ source_set("browser") {
|
|||||||
"//chromeos/ash/components/network",
|
"//chromeos/ash/components/network",
|
||||||
"//chromeos/ash/components/system",
|
"//chromeos/ash/components/system",
|
||||||
"//chromeos/ash/resources",
|
"//chromeos/ash/resources",
|
||||||
"//chromeos/resources",
|
|
||||||
"//components/chromeos_camera:mojo_mjpeg_decode_accelerator",
|
"//components/chromeos_camera:mojo_mjpeg_decode_accelerator",
|
||||||
"//components/session_manager/core",
|
"//components/session_manager/core",
|
||||||
"//services/data_decoder/public/cpp",
|
"//services/data_decoder/public/cpp",
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
#include "ash/webui/grit/ash_webui_common_resources_map.h"
|
#include "ash/webui/grit/ash_webui_common_resources_map.h"
|
||||||
#include "chromeos/ash/grit/ash_resources.h"
|
#include "chromeos/ash/grit/ash_resources.h"
|
||||||
#include "chromeos/ash/grit/ash_resources_map.h"
|
#include "chromeos/ash/grit/ash_resources_map.h"
|
||||||
#include "chromeos/grit/chromeos_resources.h"
|
|
||||||
#include "chromeos/grit/chromeos_resources_map.h"
|
|
||||||
#include "content/grit/content_resources.h"
|
#include "content/grit/content_resources.h"
|
||||||
#include "content/grit/content_resources_map.h"
|
#include "content/grit/content_resources_map.h"
|
||||||
#include "mojo/public/js/grit/mojo_bindings_resources.h"
|
#include "mojo/public/js/grit/mojo_bindings_resources.h"
|
||||||
@ -41,12 +39,6 @@ const std::set<int> GetContentResourceIds() {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::set<int> GetChromeosMojoResourceIds() {
|
|
||||||
return std::set<int>{
|
|
||||||
IDR_NETWORK_DIAGNOSTICS_MOJOM_LITE_JS,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::set<int> GetAshMojoResourceIds() {
|
const std::set<int> GetAshMojoResourceIds() {
|
||||||
return std::set<int>{
|
return std::set<int>{
|
||||||
IDR_MULTIDEVICE_DEVICE_SYNC_MOJOM_LITE_JS,
|
IDR_MULTIDEVICE_DEVICE_SYNC_MOJOM_LITE_JS,
|
||||||
@ -89,8 +81,6 @@ void PopulateSharedResourcesDataSource(WebUIDataSource* source) {
|
|||||||
source->AddResourcePaths(kMojoBindingsResources);
|
source->AddResourcePaths(kMojoBindingsResources);
|
||||||
AddResources(GetContentResourceIds(), kContentResources,
|
AddResources(GetContentResourceIds(), kContentResources,
|
||||||
kContentResourcesSize, source);
|
kContentResourcesSize, source);
|
||||||
AddResources(GetChromeosMojoResourceIds(), kChromeosResources,
|
|
||||||
kChromeosResourcesSize, source);
|
|
||||||
AddResources(GetAshMojoResourceIds(), kAshResources, kAshResourcesSize,
|
AddResources(GetAshMojoResourceIds(), kAshResources, kAshResourcesSize,
|
||||||
source);
|
source);
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||||
|
@ -844,9 +844,6 @@
|
|||||||
"META": {"sizes": {"includes": [30],}},
|
"META": {"sizes": {"includes": [30],}},
|
||||||
"includes": [6380],
|
"includes": [6380],
|
||||||
},
|
},
|
||||||
"chromeos/resources/chromeos_resources.grd": {
|
|
||||||
"includes": [6400],
|
|
||||||
},
|
|
||||||
"<(SHARED_INTERMEDIATE_DIR)/ash/webui/eche_app_ui/ash_eche_app_resources.grd": {
|
"<(SHARED_INTERMEDIATE_DIR)/ash/webui/eche_app_ui/ash_eche_app_resources.grd": {
|
||||||
"META": {"sizes": {"includes": [50],}},
|
"META": {"sizes": {"includes": [50],}},
|
||||||
"includes": [6420],
|
"includes": [6420],
|
||||||
|
Reference in New Issue
Block a user