Commit 5dd8c42f authored by Jose Magana's avatar Jose Magana Committed by Commit Bot

Moving HelpApp to src from src-internal

Follow adapted version of: crbug/1051776
as migration plan:
Step 1: (This CL)
- add .gitignore entry for new path
- add entry to src/DEPS for HelpApp
- point references to app to the new entry

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

Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Change-Id: Iea0ccd46670f91824fc4c95ceb630c4bc7af791f
Bug: 1080474
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2182702
Commit-Queue: Jose Magana <jomag@chromium.org>
Reviewed-by: default avatarTrent Apted <tapted@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarRachel Carpenter <carpenterr@chromium.org>
Reviewed-by: default avatarMichael Moss <mmoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768559}
parent bdc70e0e
......@@ -174,6 +174,7 @@ vs-chromium-project.txt
/chromecast/internal
/chromeos/assistant/internal
/chromeos/components/help_app_ui/resources/app
/chromeos/components/help_app_ui/resources/prod
/chromeos/components/media_app_ui/resources/app
/chromeos/components/media_app_ui/resources/pkg
/chromeos/profiles/chromeos.orderfile.txt
......
......@@ -1529,6 +1529,17 @@ deps = {
'condition': 'checkout_src_internal',
},
'src/chromeos/components/help_app_ui/resources/prod': {
'packages': [
{
'package': 'chromeos_internal/apps/help_app/app',
'version': '4LNO2QORJBlLuLF5s9dotu4sFJmSIF4tM_K_Xa7AxcIC',
},
],
'condition': 'checkout_chromeos and checkout_src_internal',
'dep_type': 'cipd',
},
'src/third_party/google_android_play_core': {
'packages': [
{
......
......@@ -64,9 +64,9 @@ grit("help_app_resources") {
# Resources automatically served by the chrome://help-app bundle, obtained via DEPS.
grit("help_app_bundle_resources") {
if (enable_cros_help_app) {
# Obtained via src-internal/DEPS.
# Obtained via an internal CIPD package in src/DEPS.
source =
"../components/help_app_ui/resources/app/help_app_bundle_resources.grd"
"../components/help_app_ui/resources/prod/help_app_bundle_resources.grd"
} else {
source = "../components/help_app_ui/resources/mock/help_app_bundle_mock_resources.grd"
}
......
......@@ -289,7 +289,7 @@
# src_internal is available. Lower bound is that we bundle ~100 images for
# offline articles with the app, as well as strings in every language (74),
# and bundled content in the top 25 languages (25 x 2).
"chromeos/components/help_app_ui/resources/app/help_app_bundle_resources.grd": {
"chromeos/components/help_app_ui/resources/prod/help_app_bundle_resources.grd": {
"META": {"sizes": {"includes": [300],}}, # Relies on src-internal.
"includes": [2540],
},
......
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