Merge pull request #19 from qais-yousef/compile-bcc-on-the-host

buildstrap: execute build-bcc.sh on the host using chroot

2 files changed, 3 insertions, 7 deletions

diff --git a/androdeb b/androdeb
index 3600a5b..9f1a1ef 100755
--- a/androdeb
+++ b/androdeb
@@ -361,11 +361,6 @@ $ADB push $TDIR/deb.tar.gz /data/androdeb/
 $ADB push $spath/addons/* /data/androdeb/
 $ADB shell /data/androdeb/device-unpack
 
-# Build BCC and install bcc on device if needed
-if [ $INSTALL_BCC -eq 1 ]; then
-	$ADB shell /data/androdeb/run-command /bcc-master/build-bcc.sh;
-fi
-
 # Extract a tar of the built, compiled and installed androdeb env
 if [[ ! -z ${TARDIR+x} ]]; then
 	c_info "Creating tarball"
diff --git a/buildstrap b/buildstrap
index b33b71e..ce8a314 100755
--- a/buildstrap
+++ b/buildstrap
@@ -62,10 +62,11 @@ echo "nameserver 4.2.2.2" > $OUT_TMP/etc/resolv.conf
 # Clone BCC if needed
 if [ $INSTALL_BCC -eq 1 ]; then
 	git clone https://github.com/iovisor/bcc.git $TDIR/debian/bcc-master
-	cp $spath/bcc/build-bcc.sh $TDIR/debian/bcc-master/;
+	cp $spath/bcc/build-bcc.sh $TDIR/debian/bcc-master/
+	chroot $OUT_TMP /bcc-master/build-bcc.sh
 fi
 
-# Should be really do this?
+# Should we really do this?
 chmod -R 0777 $TDIR/
 
 [ $SKIP_DEVICE -eq 0 ] || exit 0