Commit 0e00a2be authored by Kevin Marshall's avatar Kevin Marshall Committed by Commit Bot

Roll Fuchsia SDK from df9325278da7 to f1d59a7ee9f4

The AutoRoll server is located here: https://autoroll.skia.org/r/fuchsia-sdk-chromium-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

TBR=wez@chromium.org
CQ_INCLUDE_TRYBOTS=luci.chromium.try:fuchsia_arm64_cast_audio;luci.chromium.try:fuchsia_x64_cast_audio

Change-Id: Ib2d62c836525ba70e7a80f42f6c00c7ff9852310
Reviewed-on: https://chromium-review.googlesource.com/1240737Reviewed-by: default avatarWez <wez@chromium.org>
Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593751}
parent 7f62e82c
...@@ -10,7 +10,7 @@ assert(is_fuchsia) ...@@ -10,7 +10,7 @@ assert(is_fuchsia)
assert(!is_posix) assert(!is_posix)
config("compiler") { config("compiler") {
sdk_version_file = rebase_path("$fuchsia_sdk/.hash") sdk_version_file = rebase_path("${fuchsia_sdk}/.hash")
sdk_version = read_file(sdk_version_file, "trim string") sdk_version = read_file(sdk_version_file, "trim string")
defines = [ defines = [
# To force full builds after SDK updates in case of ABI changes. # To force full builds after SDK updates in case of ABI changes.
...@@ -64,14 +64,13 @@ action("blobstore_extended_fvm") { ...@@ -64,14 +64,13 @@ action("blobstore_extended_fvm") {
# limitation in the future. # limitation in the future.
_extend_size = "1073741824" # 1GB _extend_size = "1073741824" # 1GB
_target_dir = "//third_party/fuchsia-sdk/sdk/target/${current_cpu}" _target_dir = "${fuchsia_sdk}/target/${current_cpu}"
script = "//build/config/fuchsia/extend_fvm.py" script = "//build/config/fuchsia/extend_fvm.py"
inputs = [ inputs = [
"${fuchsia_sdk}/tools/fvm",
"${_target_dir}/fvm.blk", "${_target_dir}/fvm.blk",
"${_target_dir}/bootdata-blob.bin",
"${_target_dir}/zircon.bin",
] ]
outputs = [ outputs = [
blobstore_extended_path, blobstore_extended_path,
......
...@@ -96,9 +96,7 @@ class DeviceTarget(target.Target): ...@@ -96,9 +96,7 @@ class DeviceTarget(target.Target):
boot_data.ConfigureDataFVM(self._output_dir, boot_data.ConfigureDataFVM(self._output_dir,
boot_data.FVM_TYPE_SPARSE)), boot_data.FVM_TYPE_SPARSE)),
EnsurePathExists(boot_data.GetTargetFile(self._GetTargetSdkArch(), EnsurePathExists(boot_data.GetTargetFile(self._GetTargetSdkArch(),
'zircon.bin')), 'fuchsia.zbi')),
EnsurePathExists(boot_data.GetTargetFile(self._GetTargetSdkArch(),
'bootdata-blob.bin')),
'--'] + boot_data.GetKernelArgs(self._output_dir) '--'] + boot_data.GetKernelArgs(self._output_dir)
logging.debug(' '.join(bootserver_command)) logging.debug(' '.join(bootserver_command))
subprocess.check_call(bootserver_command) subprocess.check_call(bootserver_command)
......
df9325278da72d1392b3cc2ae5c4ac6a18ecc929 f1d59a7ee9f430a3b747d6b9f2231c91894a4b05
\ No newline at end of file
6c7feea544c29a42e087bad5bf791f80dc015d6a 0ecb430a99cc7df23311a308bfa7e187a19ca435
\ No newline at end of file
...@@ -72,10 +72,12 @@ class QemuTarget(target.Target): ...@@ -72,10 +72,12 @@ class QemuTarget(target.Target):
qemu_command = [qemu_path, qemu_command = [qemu_path,
'-m', str(self._ram_size_mb), '-m', str(self._ram_size_mb),
'-nographic', '-nographic',
'-kernel', EnsurePathExists(self._GetTargetKernelPath()), '-kernel', EnsurePathExists(
boot_data.GetTargetFile(self._GetTargetSdkArch(),
'qemu-kernel.bin')),
'-initrd', EnsurePathExists( '-initrd', EnsurePathExists(
boot_data.GetTargetFile(self._GetTargetSdkArch(), boot_data.GetTargetFile(self._GetTargetSdkArch(),
'bootdata-blob.bin')), 'fuchsia.zbi')),
'-smp', str(self._cpu_cores), '-smp', str(self._cpu_cores),
# Attach the blobstore and data volumes. Use snapshot mode to discard # Attach the blobstore and data volumes. Use snapshot mode to discard
...@@ -167,10 +169,3 @@ class QemuTarget(target.Target): ...@@ -167,10 +169,3 @@ class QemuTarget(target.Target):
def _GetSshConfigPath(self): def _GetSshConfigPath(self):
return boot_data.GetSSHConfigPath(self._output_dir) return boot_data.GetSSHConfigPath(self._output_dir)
def _GetTargetKernelPath(self):
kernel_name = 'zircon.bin'
if self._GetTargetSdkArch() == 'arm64':
kernel_name = 'qemu-zircon.bin'
return boot_data.GetTargetFile(self._GetTargetSdkArch(),
kernel_name)
...@@ -180,6 +180,7 @@ fuchsia_sdk_fidl_pkg("gfx") { ...@@ -180,6 +180,7 @@ fuchsia_sdk_fidl_pkg("gfx") {
] ]
deps = [ deps = [
":images", ":images",
":mem",
":vectorial", ":vectorial",
] ]
} }
......
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