From 59a33b64a0e2a489b28c2d5e7ed1d462ef287eb8 Mon Sep 17 00:00:00 2001 From: "seanparent@google.com" Date: Wed, 4 Nov 2009 21:04:51 +0000 Subject: [PATCH] Removed old base and glog, added DEP for chrome/base, cleaned up usage of namespaces, minor build speed up using -j option for more scons. Review URL: http://chromereview.prom.corp.google.com/1180018 git-svn-id: svn://chrome-svn/chromeos/trunk@160 06c00378-0e64-4dae-be16-12b19f9950a1 --- build_platform_packages.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build_platform_packages.sh b/build_platform_packages.sh index 64100ccf36..8fc6b41f55 100755 --- a/build_platform_packages.sh +++ b/build_platform_packages.sh @@ -20,6 +20,9 @@ eval set -- "${FLAGS_ARGV}" # Die on error set -e +# Number of jobs for scons calls. +NUM_JOBS=`cat /proc/cpuinfo | grep processor | awk '{a++} END {print a}'` + PLATFORM_DIR="$SRC_ROOT/platform" PLATFORM_DIRS="assets control_panel fake_hal init installer login_manager \ @@ -28,7 +31,7 @@ PLATFORM_DIRS="assets control_panel fake_hal init installer login_manager \ monitor_reconfig" THIRD_PARTY_DIR="$SRC_ROOT/third_party" -THIRD_PARTY_PACKAGES="connman e2fsprogs/files gflags gtest glog \ +THIRD_PARTY_PACKAGES="connman e2fsprogs/files gflags gtest \ ply-image slim/src synaptics \ wpa_supplicant xscreensaver/xscreensaver-5.08 \ xserver-xorg-core xserver-xorg-video-intel" @@ -44,14 +47,14 @@ done # Build base lib next, since packages depend on it. echo "Building base library..." -cd "$PLATFORM_DIR/base" -scons +cd "$THIRD_PARTY_DIR/chrome" +scons -j$NUM_JOBS cd - #Build common lib next. echo "Building common library..." cd "$SRC_ROOT/common" -scons +scons -j$NUM_JOBS cd - # Build platform packages