Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3516)

Unified Diff: build/linux/sysroot_scripts/sysroot-creator-trusty.sh

Issue 2567123002: Sysroot: Add build_and_upload.py (Closed)
Patch Set: Return non-zero exit code if any sysroot builds failed Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/linux/sysroot_scripts/sysroot-creator-trusty.sh
diff --git a/build/linux/sysroot_scripts/sysroot-creator-trusty.sh b/build/linux/sysroot_scripts/sysroot-creator-trusty.sh
index 27fe7944b1ad1447fd76a1a09c77cc7f15038a68..ffba62351e577db47a00ef2e6be3508dafe374d8 100755
--- a/build/linux/sysroot_scripts/sysroot-creator-trusty.sh
+++ b/build/linux/sysroot_scripts/sysroot-creator-trusty.sh
@@ -3,7 +3,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DISTRO=ubuntu
DIST=trusty
@@ -15,10 +15,12 @@ APT_REPO_ARM=http://ports.ubuntu.com
APT_REPO_ARM64=http://ports.ubuntu.com
KEYRING_FILE=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-HAS_ARCH_AMD64=1
-HAS_ARCH_I386=1
HAS_ARCH_ARM=1
-HAS_ARCH_ARM64=1
+
+# Trusty supports these architectures but they are not needed by chrome.
+# HAS_ARCH_AMD64=1
+# HAS_ARCH_I386=1
+# HAS_ARCH_ARM64=1
# Sysroot packages: these are the packages needed to build chrome.
# NOTE: When DEBIAN_PACKAGES is modified, the packagelist files must be updated
@@ -189,4 +191,4 @@ DEBIAN_PACKAGES="\
DEBIAN_PACKAGES_X86="libquadmath0"
-. ${SCRIPT_DIR}/sysroot-creator.sh
+. "${SCRIPT_DIR}/sysroot-creator.sh"
« no previous file with comments | « build/linux/sysroot_scripts/sysroot-creator-test.sh ('k') | build/linux/sysroot_scripts/sysroot-creator-wheezy.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698