0

Revert "Saving prod directory for CIPD only and use mock as the default resource"

This reverts commit 01289bcce0.

Reason for revert: likely culprit of the tree closure (https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-rel/45901/overview)

Original change's description:
> Saving prod directory for CIPD only and use mock as the default resource
> name.
>
> Bug:1184530
> Test:
> 1. cherry-pick:http://go/crrev/c/2707305
> 2. gclient sync to get prod directory from DEPS
> 3. autoninja -C out/Default chrome && out/Default/chrome --use-system-clipboard --use-gl=swiftshader --user-data-dir=/tmp/chrome --enable-features=EcheSWA
>
> Change-Id: I0a1d869ea01ef926ef36a4f1dc8644e1340f779e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2727225
> Commit-Queue: Sam Chiu <samchiu@google.com>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Daniel Nishi <dhnishi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#859675}

Bug: 1184530
Change-Id: Ib8685bb758b153bd55f6b0ebb46eb601b18de0af
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2732099
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Cr-Commit-Position: refs/heads/master@{#859691}
This commit is contained in:
Maksim Moskvitin
2021-03-04 09:09:19 +00:00
committed by Chromium LUCI CQ
parent 2e1ebe395b
commit b2dbca74bb
9 changed files with 4 additions and 24 deletions
chromeos
tools/gritsettings

@ -1,8 +0,0 @@
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
declare_args() {
# Whether to enable the "real" ChromeOS Media App. When false, a mock app is
# bundled for testing integration points.
enable_cros_eche_app = is_chromeos_ash && is_chrome_branded
}

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//chromeos/assistant/assistant.gni")
import("//chromeos/components/eche_app_ui/eche_app_ui.gni")
import("//chromeos/components/help_app_ui/help_app_ui.gni")
import("//chromeos/components/media_app_ui/media_app_ui.gni")
import("//tools/grit/grit_rule.gni")
@ -24,7 +23,6 @@ grit("resources") {
defines = [
"enable_cros_libassistant=$enable_cros_libassistant",
"enable_cros_media_app=$enable_cros_media_app",
"enable_cros_eche_app=$enable_cros_eche_app",
]
grit_flags = [
@ -295,14 +293,11 @@ grit("eche_app_resources") {
# Resources automatically served by the chrome://eche-app bundle, obtained via DEPS.
grit("eche_bundle_resources") {
# These arguments are needed since the grd is generated at build time.
enable_input_discovery_for_gn_analyze = false
# Obtained via an internal CIPD package in src/DEPS.
if (enable_cros_media_app) {
# Obtained via an internal CIPD package in src/DEPS.
source =
"../components/eche_app_ui/resources/prod/eche_bundle_resources.grd"
} else {
source = "../components/eche_app_ui/resources/mock/eche_bundle_mock_resources.grd"
}
source = "../components/eche_app_ui/resources/prod/eche_bundle_resources.grd"
use_brotli = true

@ -419,17 +419,10 @@
"META": {"sizes": {"includes": [50],}},
"includes": [2670],
},
# Both eche_bundle_resources.grd and eche_bundle_mock_resources.grd
# start with the same id because only one of them is built depending on if
# src_internal is available.
"chromeos/components/eche_app_ui/resources/prod/eche_bundle_resources.grd": {
"META": {"sizes": {"includes": [50],}},
"includes": [2680],
},
"chromeos/components/eche_app_ui/resources/mock/eche_bundle_mock_resources.grd": {
"META": {"sizes": {"includes": [50],}},
"includes": [2680],
},
# END chromeos/ section.
# START components/ section.