mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 21:46:58 +02:00
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
This commit is contained in:
parent
83bcbe4507
commit
59a33b64a0
@ -20,6 +20,9 @@ eval set -- "${FLAGS_ARGV}"
|
|||||||
# Die on error
|
# Die on error
|
||||||
set -e
|
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_DIR="$SRC_ROOT/platform"
|
||||||
|
|
||||||
PLATFORM_DIRS="assets control_panel fake_hal init installer login_manager \
|
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"
|
monitor_reconfig"
|
||||||
|
|
||||||
THIRD_PARTY_DIR="$SRC_ROOT/third_party"
|
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 \
|
ply-image slim/src synaptics \
|
||||||
wpa_supplicant xscreensaver/xscreensaver-5.08 \
|
wpa_supplicant xscreensaver/xscreensaver-5.08 \
|
||||||
xserver-xorg-core xserver-xorg-video-intel"
|
xserver-xorg-core xserver-xorg-video-intel"
|
||||||
@ -44,14 +47,14 @@ done
|
|||||||
|
|
||||||
# Build base lib next, since packages depend on it.
|
# Build base lib next, since packages depend on it.
|
||||||
echo "Building base library..."
|
echo "Building base library..."
|
||||||
cd "$PLATFORM_DIR/base"
|
cd "$THIRD_PARTY_DIR/chrome"
|
||||||
scons
|
scons -j$NUM_JOBS
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
#Build common lib next.
|
#Build common lib next.
|
||||||
echo "Building common library..."
|
echo "Building common library..."
|
||||||
cd "$SRC_ROOT/common"
|
cd "$SRC_ROOT/common"
|
||||||
scons
|
scons -j$NUM_JOBS
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
# Build platform packages
|
# Build platform packages
|
||||||
|
Loading…
Reference in New Issue
Block a user