chromium/src
0
Fork 0
Code Activity

Moving MediaApp to src/DEPS from src-internal.

Browse Source 
Follow adapted version of: crbug/1051776
and https://chromium-review.googlesource.com/c/chromium/src/+/2182702
as migration plan:
Step 1: (This CL)
- add .gitignore entry for new path
- add entry to src/DEPS for MediaApp
- point references to app to the new entry

Step 2: (CL internal: https://chrome-internal-review.googlesource.com/c/chrome/src-internal/+/3089141)
- remove entry for app in src-internal/DEPS

Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Bug: 1080473

Change-Id: I942c3f24382b6c1c9ad0688364e932090ea3e5fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230559
Auto-Submit: Jose Magana <jomag@chromium.org>
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776494}
This commit is contained in:
Jose Magana
2020-06-09 13:33:00 +00:00
committed by Commit Bot
parent b12692bece
commit d34f1701a1
4 changed files with 15 additions and 3 deletions
.gitignoreDEPS
chromeos/resources
BUILD.gn
tools/gritsettings
resource_ids.spec

1
.gitignore vendored

@ -174,6 +174,7 @@ vs-chromium-project.txt
/chromeos/assistant/internal /chromeos/assistant/internal
/chromeos/components/help_app_ui/resources/app /chromeos/components/help_app_ui/resources/app
/chromeos/components/help_app_ui/resources/prod /chromeos/components/help_app_ui/resources/prod
/chromeos/components/media_app_ui/resources/prod
/chromeos/components/media_app_ui/resources/app /chromeos/components/media_app_ui/resources/app
/chromeos/components/media_app_ui/resources/pkg /chromeos/components/media_app_ui/resources/pkg
/chromeos/profiles/chromeos.orderfile.txt /chromeos/profiles/chromeos.orderfile.txt

11
DEPS

@ -1539,6 +1539,17 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
'src/chromeos/components/media_app_ui/resources/prod': {
'packages': [
{
'package': 'chromeos_internal/apps/media_app/app',
'version': 'F-avF4Ri2hix7udnvUw4Kpy8yj3WwML3J-8znYT-jvYC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
'dep_type': 'cipd',
},
'src/third_party/google_android_play_core': { 'src/third_party/google_android_play_core': {
'packages': [ 'packages': [
{ {

4
chromeos/resources/BUILD.gn

@ -132,8 +132,8 @@ grit("media_app_resources") {
# Resources automatically served by the chrome://media-app bundle, obtained via DEPS. # Resources automatically served by the chrome://media-app bundle, obtained via DEPS.
grit("media_app_bundle_resources") { grit("media_app_bundle_resources") {
if (enable_cros_media_app) { if (enable_cros_media_app) {
# Obtained via src-internal/DEPS. # Obtained via an internal CIPD package in src/DEPS.
source = "../components/media_app_ui/resources/pkg/media_app_bundle_resources.grd" source = "../components/media_app_ui/resources/prod/media_app_bundle_resources.grd"
} else { } else {
source = "../components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd" source = "../components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd"
} }

2
tools/gritsettings/resource_ids.spec

@ -307,7 +307,7 @@
# start with the same id because only one of them is built depending on if # start with the same id because only one of them is built depending on if
# src_internal is available. Lower bound for number of resource ids is number # src_internal is available. Lower bound for number of resource ids is number
# of languages (74). # of languages (74).
"chromeos/components/media_app_ui/resources/pkg/media_app_bundle_resources.grd": { "chromeos/components/media_app_ui/resources/prod/media_app_bundle_resources.grd": {
"META": {"sizes": {"includes": [120],}}, # Relies on src-internal. "META": {"sizes": {"includes": [120],}}, # Relies on src-internal.
"includes": [2580], "includes": [2580],
}, },