diff options
Diffstat (limited to 'chromium/build/config/fuchsia')
| -rw-r--r-- | chromium/build/config/fuchsia/BUILD.gn | 7 | ||||
| -rw-r--r-- | chromium/build/config/fuchsia/generate_runner_scripts.gni | 34 | ||||
| -rw-r--r-- | chromium/build/config/fuchsia/gfx_tests.cmx | 5 | ||||
| -rw-r--r-- | chromium/build/config/fuchsia/package.gni | 25 |
4 files changed, 23 insertions, 48 deletions
diff --git a/chromium/build/config/fuchsia/BUILD.gn b/chromium/build/config/fuchsia/BUILD.gn index 7ee1923d946..427f364a6b4 100644 --- a/chromium/build/config/fuchsia/BUILD.gn +++ b/chromium/build/config/fuchsia/BUILD.gn @@ -13,6 +13,13 @@ config("compiler") { # but on other platforms it's much higher, so a variety of code assumes more # will be available. Raise to 8M which matches e.g. macOS. ldflags = [ "-Wl,-z,stack-size=0x800000" ] + + if (target_cpu != "arm64") { + # TODO(https://crbug.com/1086134): RELR packing of dynamic relocations is + # enabled by default in the Fuchsia toolchain, but is not fully supported + # in Chromium builds except on ARM64. + ldflags += [ "-Wl,--pack-dyn-relocs=none" ] + } } # Settings for executables. diff --git a/chromium/build/config/fuchsia/generate_runner_scripts.gni b/chromium/build/config/fuchsia/generate_runner_scripts.gni index 2f57fc0c607..a0bae5eee6b 100644 --- a/chromium/build/config/fuchsia/generate_runner_scripts.gni +++ b/chromium/build/config/fuchsia/generate_runner_scripts.gni @@ -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,29 +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 - _manifest_path = "$_pkg_dir/${_archive_shortname}.archive_manifest" - _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" @@ -100,7 +87,6 @@ template("fuchsia_package_runner") { # Declares the files that are needed for test execution on the # swarming test client. data = [ - _manifest_path, "//build/fuchsia/", "//build/util/lib/", "//third_party/fuchsia-sdk/sdk/.build-id/", @@ -167,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) { diff --git a/chromium/build/config/fuchsia/gfx_tests.cmx b/chromium/build/config/fuchsia/gfx_tests.cmx index 5e51f421120..081fc0f5482 100644 --- a/chromium/build/config/fuchsia/gfx_tests.cmx +++ b/chromium/build/config/fuchsia/gfx_tests.cmx @@ -11,15 +11,20 @@ "zero" ], "services": [ + "fuchsia.accessibility.semantics.SemanticsManager", + "fuchsia.device.NameProvider", "fuchsia.fonts.Provider", "fuchsia.intl.PropertyProvider", "fuchsia.logger.Log", "fuchsia.logger.LogSink", + "fuchsia.memorypressure.Provider", "fuchsia.process.Launcher", "fuchsia.sys.Environment", "fuchsia.sys.Loader", "fuchsia.sysmem.Allocator", "fuchsia.tracing.provider.Registry", + "fuchsia.ui.input.ImeService", + "fuchsia.ui.input.ImeVisibilityService", "fuchsia.ui.policy.Presenter", "fuchsia.ui.scenic.Scenic", "fuchsia.vulkan.loader.Loader" diff --git a/chromium/build/config/fuchsia/package.gni b/chromium/build/config/fuchsia/package.gni index e7bca251c5f..51ebad637b1 100644 --- a/chromium/build/config/fuchsia/package.gni +++ b/chromium/build/config/fuchsia/package.gni @@ -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)) { |