Commit 13734d46 authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Switch to Debian Sid sysroot

BUG=800977
R=thestig,dpranke
CC=​dcastagna

Change-Id: I75a468d6d00389b94faa2432d66c934f06037ff9
Reviewed-on: https://chromium-review.googlesource.com/930233Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538989}
parent 01d65ffe
...@@ -295,7 +295,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, void* context_ptr) { ...@@ -295,7 +295,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, void* context_ptr) {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
crash_addr = reinterpret_cast<uintptr_t>(info->si_addr); crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
#else // OS_POSIX && !OS_MACOSX #else // OS_POSIX && !OS_MACOSX
struct ucontext* context = reinterpret_cast<struct ucontext*>(context_ptr); ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
#if defined(ARCH_CPU_X86) #if defined(ARCH_CPU_X86)
crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]); crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]);
#elif defined(ARCH_CPU_X86_64) #elif defined(ARCH_CPU_X86_64)
......
...@@ -32,17 +32,17 @@ if (current_os == target_os && current_cpu == target_cpu && ...@@ -32,17 +32,17 @@ if (current_os == target_os && current_cpu == target_cpu &&
# By default build against a sysroot image downloaded from Cloud Storage # By default build against a sysroot image downloaded from Cloud Storage
# during gclient runhooks. # during gclient runhooks.
if (current_cpu == "x64") { if (current_cpu == "x64") {
sysroot = "$target_sysroot_dir/debian_stretch_amd64-sysroot" sysroot = "$target_sysroot_dir/debian_sid_amd64-sysroot"
} else if (current_cpu == "x86") { } else if (current_cpu == "x86") {
sysroot = "$target_sysroot_dir/debian_stretch_i386-sysroot" sysroot = "$target_sysroot_dir/debian_sid_i386-sysroot"
} else if (current_cpu == "mipsel") { } else if (current_cpu == "mipsel") {
sysroot = "$target_sysroot_dir/debian_stretch_mips-sysroot" sysroot = "$target_sysroot_dir/debian_sid_mips-sysroot"
} else if (current_cpu == "mips64el") { } else if (current_cpu == "mips64el") {
sysroot = "$target_sysroot_dir/debian_stretch_mips64el-sysroot" sysroot = "$target_sysroot_dir/debian_sid_mips64el-sysroot"
} else if (current_cpu == "arm") { } else if (current_cpu == "arm") {
sysroot = "$target_sysroot_dir/debian_stretch_arm-sysroot" sysroot = "$target_sysroot_dir/debian_sid_arm-sysroot"
} else if (current_cpu == "arm64") { } else if (current_cpu == "arm64") {
sysroot = "$target_sysroot_dir/debian_stretch_arm64-sysroot" sysroot = "$target_sysroot_dir/debian_sid_arm64-sysroot"
} else { } else {
assert(false, "No linux sysroot for cpu: $target_cpu") assert(false, "No linux sysroot for cpu: $target_cpu")
} }
......
...@@ -87,7 +87,7 @@ def main(args): ...@@ -87,7 +87,7 @@ def main(args):
def InstallDefaultSysrootForArch(target_arch): def InstallDefaultSysrootForArch(target_arch):
if target_arch not in VALID_ARCHS: if target_arch not in VALID_ARCHS:
raise Error('Unknown architecture: %s' % target_arch) raise Error('Unknown architecture: %s' % target_arch)
InstallSysroot('Stretch', target_arch) InstallSysroot('Sid', target_arch)
def InstallSysroot(target_platform, target_arch): def InstallSysroot(target_platform, target_arch):
......
...@@ -242,7 +242,7 @@ DEBIAN_PACKAGES="\ ...@@ -242,7 +242,7 @@ DEBIAN_PACKAGES="\
libvorbis0a libvorbis0a
libvorbisenc2 libvorbisenc2
libvpx-dev libvpx-dev
libvpx4 libvpx5
libwayland-client0 libwayland-client0
libwayland-cursor0 libwayland-cursor0
libwayland-dev libwayland-dev
......
{ {
"sid_amd64": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
"Sha1Sum": "85ac8d5e0f6cff99fc323fd3d29cb73e2aa970e2",
"SysrootDir": "debian_sid_amd64-sysroot",
"Tarball": "debian_sid_amd64_sysroot.tar.xz"
},
"sid_arm": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
"Sha1Sum": "ed31924757f11885a21793dc4b928d07ab25740c",
"SysrootDir": "debian_sid_arm-sysroot",
"Tarball": "debian_sid_arm_sysroot.tar.xz"
},
"sid_arm64": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
"Sha1Sum": "b9447285e58c5260bd9fa2737d1f0d1f82156738",
"SysrootDir": "debian_sid_arm64-sysroot",
"Tarball": "debian_sid_arm64_sysroot.tar.xz"
},
"sid_i386": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
"Sha1Sum": "f09856d93f39e8df84ffd9c04881f44e6cbc0508",
"SysrootDir": "debian_sid_i386-sysroot",
"Tarball": "debian_sid_i386_sysroot.tar.xz"
},
"sid_mips": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
"Sha1Sum": "90586b566b567b2bcf49e7fd112f0c8189bbd07b",
"SysrootDir": "debian_sid_mips-sysroot",
"Tarball": "debian_sid_mips_sysroot.tar.xz"
},
"sid_mips64el": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
"Sha1Sum": "f90c3b81485ffebb283afddb1a72bc61e14c593d",
"SysrootDir": "debian_sid_mips64el-sysroot",
"Tarball": "debian_sid_mips64el_sysroot.tar.xz"
},
"stretch_amd64": { "stretch_amd64": {
"Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66", "Revision": "3c248ba4290a5ad07085b7af07e6785bf1ae5b66",
"Sha1Sum": "a668aafe335848c6e4aed11d0b32ea2d5c5a124d", "Sha1Sum": "a668aafe335848c6e4aed11d0b32ea2d5c5a124d",
......
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