Commit 5df93ec8 authored by David Dorwin's avatar David Dorwin Committed by Commit Bot

[fuchsia] Remove support for appending release channel name to packages

This reverts commit c0913ca9 and most
of commit b11af76b, including support
for release channel suffix on packages, archive_name_override, and C++
build flags for channel name.

context_provider_test_connector.* are kept in their new locations.

The TODO for https://crbug.com/1046615 is removed as that is obsolete.

Bug: 1029184,1046615,1049378
Change-Id: Ia0b7191d15a889bc497ce77a4250b9db168e58f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2262594Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782035}
parent aa698d24
......@@ -26,12 +26,9 @@ declare_args() {
# package_name_override: Specifies the name of the generated package, if its
# name is different than the |package| target name. This value must match
# package_name_override in the |package| target.
# archive_name_override: Specifies the filename of the archive file (FAR)
# which contains the package's data.
# If left unset, defaults to |package_name_override|.
# Defaults to the package's name.
# package_deps: An array of [package, archive_basename] pairs that specify
# additional dependency packages to be installed prior to execution.
# package_deps: An array of [package, package_name_override] array pairs
# which specify additional dependency packages to be installed
# prior to execution.
# runner_script: The runner script implementation to use, relative to
# "build/fuchsia". Defaults to "test_runner.py".
# install_only: If true, executing the script will only install the package
......@@ -39,28 +36,19 @@ declare_args() {
template("fuchsia_package_runner") {
forward_variables_from(invoker, [ "runner_script" ])
# Compute the package name.
if (defined(invoker.package_name_override)) {
_package_name = invoker.package_name_override
_pkg_shortname = invoker.package_name_override
} else {
_package_name = get_label_info(invoker.package, "name")
}
# Compute the archive (FAR) filename.
if (defined(invoker.archive_name_override)) {
_archive_shortname = invoker.archive_name_override
} else {
_archive_shortname = _package_name
_pkg_shortname = get_label_info(invoker.package, "name")
}
_pkg_dir = "$root_out_dir/gen/" + get_label_info(invoker.package, "dir") +
"/" + _archive_shortname
_package_path = "$_pkg_dir/${_archive_shortname}.far"
"/" + _pkg_shortname
_package_path = "$_pkg_dir/${_pkg_shortname}.far"
generated_run_pkg_script_path =
"$root_build_dir/bin/run_${_archive_shortname}"
generated_run_pkg_script_path = "$root_build_dir/bin/run_${_pkg_shortname}"
generated_install_pkg_script_path =
"$root_build_dir/bin/install_${_archive_shortname}"
"$root_build_dir/bin/install_$_pkg_shortname"
_generate_runner_target = "${target_name}__generate_runner"
_generate_installer_target = "${target_name}__generate_installer"
......@@ -165,7 +153,7 @@ template("fuchsia_package_runner") {
"--target-cpu",
target_cpu,
"--package-name",
_package_name,
_pkg_shortname,
]
if (defined(invoker.use_test_server) && invoker.use_test_server) {
......
......@@ -13,9 +13,6 @@ import("//third_party/fuchsia-sdk/sdk/build/package.gni")
# Parameters are:
# package_name_override: Specifies the name of the package to generate,
# if different than |target_name|.
# archive_filename_override: Specifies the filename of the generated FAR.
# If left unset, defaults to |package_name_override|.
# Defaults to the target name.
# binary: The executable target which should be launched.
# manifest: A path to the manifest that will be used.
# "testonly" targets default to using
......@@ -107,27 +104,7 @@ template("cr_fuchsia_package") {
}
}
# Generate a Fuchsia ARchive (FAR) of the requested name.
if (defined(invoker.archive_name_override)) {
_archive_name = invoker.archive_name_override
} else {
_archive_name = _package_name
}
if (_archive_name != _package_name) {
_archive_target = target_name + "__cr-archive"
copy(target_name) {
deps = [ ":${_archive_target}" ]
_pkg_out_dir = "${target_gen_dir}/${_package_name}"
sources = [ "${_pkg_out_dir}/${_package_name}.far" ]
outputs = [ "${_pkg_out_dir}/${_archive_name}.far" ]
}
} else {
_archive_target = target_name
}
fuchsia_package(_archive_target) {
fuchsia_package(target_name) {
forward_variables_from(invoker, [ "testonly" ])
package_name = _package_name
if (defined(invoker.excluded_files)) {
......
......@@ -4,8 +4,6 @@
assert(is_fuchsia)
import("//build/buildflag_header.gni")
import("//fuchsia/release_channel.gni")
import("//third_party/fuchsia-sdk/sdk/build/fidl_library.gni")
fidl_library("cast_fidl") {
......
......@@ -4,9 +4,7 @@
assert(is_fuchsia)
import("//build/buildflag_header.gni")
import("//build/config/fuchsia/generate_runner_scripts.gni")
import("//fuchsia/release_channel.gni")
import("//testing/test.gni")
# Integration helpers for commonly used fuchsia.* APIs.
......@@ -83,13 +81,6 @@ source_set("legacymetrics") {
friend = [ ":*" ]
}
# Used to propagate release-qualified package names to integration test code.
buildflag_header("release_channel_buildflags") {
header = "release_channel.h"
flags = [ "FUCHSIA_RELEASE_CHANNEL_SUFFIX=\"$release_channel_suffix\"" ]
visibility = [ "//fuchsia/*" ]
}
source_set("test_support") {
testonly = true
sources = [
......@@ -111,7 +102,6 @@ source_set("test_support") {
public_deps = [
":base",
":modular",
":release_channel_buildflags",
"//base",
"//net",
"//net:test_support",
......
......@@ -14,8 +14,6 @@
#include "base/fuchsia/fuchsia_logging.h"
#include "base/fuchsia/process_context.h"
#include "base/strings/strcat.h"
#include "fuchsia/base/release_channel.h"
namespace cr_fuchsia {
......@@ -24,9 +22,8 @@ fidl::InterfaceHandle<fuchsia::io::Directory> StartWebEngineForTests(
component_controller_request,
const base::CommandLine& command_line) {
fuchsia::sys::LaunchInfo launch_info;
launch_info.url = base::StrCat({"fuchsia-pkg://fuchsia.com/web_engine",
BUILDFLAG(FUCHSIA_RELEASE_CHANNEL_SUFFIX),
"#meta/context_provider.cmx"});
launch_info.url =
"fuchsia-pkg://fuchsia.com/web_engine#meta/context_provider.cmx";
launch_info.arguments = command_line.argv();
// Clone stderr from the current process to WebEngine and ask it to
......
......@@ -20,7 +20,6 @@ fidl::InterfaceHandle<fuchsia::io::Directory> StartWebEngineForTests(
const base::CommandLine& command_line =
base::CommandLine(base::CommandLine::NO_PROGRAM));
// TODO(crbug.com/1046615): Use test manifests for package specification.
fuchsia::web::ContextProviderPtr ConnectContextProvider(
fidl::InterfaceRequest<fuchsia::sys::ComponentController>
component_controller_request,
......
......@@ -6,7 +6,6 @@ assert(is_fuchsia)
import("//build/config/fuchsia/generate_runner_scripts.gni")
import("//build/config/fuchsia/symbol_archive.gni")
import("//fuchsia/release_channel.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
import("//tools/grit/repack.gni")
......@@ -247,8 +246,6 @@ cr_fuchsia_package("web_engine") {
binary = ":web_engine_exe"
manifest = "context_provider.cmx"
component_name_override = "context_provider"
package_name_override = "web_engine${release_channel_suffix}"
archive_name_override = "web_engine"
excluded_files = [
"lib/libswiftshader_libEGL.so",
......@@ -395,7 +392,6 @@ executable("web_engine_shell_exec") {
deps = [
"//base",
"//fuchsia/base",
"//fuchsia/base:release_channel_buildflags",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
......
......@@ -26,7 +26,6 @@
#include "base/task/single_thread_task_executor.h"
#include "base/values.h"
#include "fuchsia/base/init_logging.h"
#include "fuchsia/base/release_channel.h"
#include "url/gurl.h"
fuchsia::sys::ComponentControllerPtr component_controller_;
......@@ -96,10 +95,8 @@ fuchsia::web::ContextProviderPtr ConnectToContextProvider(
component_context->svc()->Connect(launcher.NewRequest());
fuchsia::sys::LaunchInfo launch_info;
launch_info.url = base::StrCat({"fuchsia-pkg://fuchsia.com/web_engine",
BUILDFLAG(FUCHSIA_RELEASE_CHANNEL_SUFFIX),
"#meta/context_provider.cmx"});
launch_info.url =
"fuchsia-pkg://fuchsia.com/web_engine#meta/context_provider.cmx";
launch_info.arguments = extra_command_line_arguments;
fidl::InterfaceHandle<fuchsia::io::Directory> service_directory;
launch_info.directory_request = service_directory.NewRequest().TakeChannel();
......
# Copyright 2020 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.
declare_args() {
# Specifies the name of the release channel for specific packages
# (web_engine, web_runner, cast_runner) when buildng on a release bot.
fuchsia_release_channel = ""
}
if (fuchsia_release_channel != "") {
release_channel_suffix = "-${fuchsia_release_channel}"
} else {
release_channel_suffix = ""
}
......@@ -7,7 +7,6 @@ assert(is_fuchsia)
import("//build/buildflag_header.gni")
import("//build/config/fuchsia/generate_runner_scripts.gni")
import("//build/config/fuchsia/symbol_archive.gni")
import("//fuchsia/release_channel.gni")
import("//testing/test.gni")
declare_args() {
......@@ -15,9 +14,6 @@ declare_args() {
web_runner_remote_debugging_port = 0
}
_cast_runner_package_name = "cast_runner${release_channel_suffix}"
_web_runner_package_name = "web_runner${release_channel_suffix}"
buildflag_header("buildflags") {
header = "buildflags.h"
flags =
......@@ -105,19 +101,17 @@ executable("cast_runner_exe") {
cr_fuchsia_package("cast_runner_pkg") {
binary = ":cast_runner_exe"
package_name_override = _cast_runner_package_name
archive_name_override = "cast_runner"
component_name_override = "cast_runner"
package_name_override = "cast_runner"
manifest = "cast/cast_runner.cmx"
}
fuchsia_package_runner("cast_runner") {
package = ":cast_runner_pkg"
archive_name_override = "cast_runner"
package_name_override = "cast_runner"
install_only = true
package_deps = [ [
"//fuchsia/engine:web_engine",
"web_engine${release_channel_suffix}",
"web_engine",
] ]
}
......@@ -213,19 +207,17 @@ executable("web_runner_exe") {
cr_fuchsia_package("web_runner_pkg") {
binary = ":web_runner_exe"
package_name_override = _web_runner_package_name
component_name_override = "web_runner"
archive_name_override = "web_runner"
package_name_override = "web_runner"
manifest = "web/web_runner.cmx"
}
fuchsia_package_runner("web_runner") {
package = ":web_runner_pkg"
archive_name_override = "web_runner"
package_name_override = "web_runner"
install_only = true
package_deps = [ [
"//fuchsia/engine:web_engine",
"web_engine${release_channel_suffix}",
"web_engine",
] ]
}
......
......@@ -35,7 +35,6 @@
#include "fuchsia/base/frame_test_util.h"
#include "fuchsia/base/fuchsia_dir_scheme.h"
#include "fuchsia/base/mem_buffer_util.h"
#include "fuchsia/base/release_channel.h"
#include "fuchsia/base/result_receiver.h"
#include "fuchsia/base/string_util.h"
#include "fuchsia/base/test_devtools_list_fetcher.h"
......
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