Delete chromecast/app/resources/resource_ids
Have chromecast use the same auto-numbered tools/gritsettings/resource_ids.spec as other targets so that collisions do not occur when repacked (as happened on cast_shell_linux bot on https://chromium-review.googlesource.com/c/chromium/src/+/3107487/5). Bug: None Change-Id: I3123733b2618113239eec6ac44f280246b69721c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3115490 Reviewed-by: Sean Topping <seantopping@chromium.org> Commit-Queue: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/main@{#914787}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
58cd02b714
commit
7d17a3dd0b
@ -122,8 +122,6 @@ cast_source_set("unittests") {
|
||||
grit("resources") {
|
||||
source = "//chromecast/app/resources/shell_resources.grd"
|
||||
|
||||
resource_ids = "//chromecast/app/resources/resource_ids"
|
||||
|
||||
outputs = [
|
||||
"grit/shell_resources.h",
|
||||
"shell_resources.pak",
|
||||
@ -132,7 +130,6 @@ grit("resources") {
|
||||
|
||||
grit("chromecast_settings") {
|
||||
source = "//chromecast/app/resources/chromecast_settings.grd"
|
||||
resource_ids = "//chromecast/app/resources/resource_ids"
|
||||
|
||||
outputs = [ "grit/chromecast_settings.h" ]
|
||||
foreach(locale, cast_locales) {
|
||||
|
@ -1,25 +0,0 @@
|
||||
# Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
#
|
||||
# This file is used to assign starting resource ids for resources and strings
|
||||
# used by Chromium. This is done to ensure that resource ids are unique
|
||||
# across all the grd files. If you are adding a new grd file, please add
|
||||
# a new entry to this file.
|
||||
#
|
||||
# The first entry in the file, SRCDIR, is special: It is a relative path from
|
||||
# this file to the base of your checkout.
|
||||
#
|
||||
# http://msdn.microsoft.com/en-us/library/t2zechd4(VS.71).aspx says that the
|
||||
# range for IDR_ is 1 to 28,671 and the range for IDS_ is 1 to 32,767 and
|
||||
# common convention starts practical use of IDs at 100 or 101.
|
||||
{
|
||||
"SRCDIR": "../..",
|
||||
|
||||
"app/resources/shell_resources.grd": {
|
||||
"includes": [31000],
|
||||
},
|
||||
"app/resources/chromecast_settings.grd": {
|
||||
"messages": [31500],
|
||||
},
|
||||
}
|
@ -711,8 +711,14 @@
|
||||
"base/tracing/protos/resources.grd": {
|
||||
"includes": [3150],
|
||||
},
|
||||
"chromecast/app/resources/chromecast_settings.grd": {
|
||||
"messages": [3160],
|
||||
},
|
||||
"chromecast/app/resources/shell_resources.grd": {
|
||||
"includes": [3161],
|
||||
},
|
||||
"chromecast/renderer/resources/extensions_renderer_resources.grd": {
|
||||
"includes": [3160],
|
||||
"includes": [3162],
|
||||
},
|
||||
|
||||
"cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
|
||||
|
Reference in New Issue
Block a user