summaryrefslogtreecommitdiffstats
path: root/development/android-tools/android-tools.SlackBuild
diff options
context:
space:
mode:
author Philip van der Hoeven2016-05-05 03:24:36 +0200
committer Willy Sudiarto Raharjo2016-05-05 18:30:00 +0200
commit29023c9d3bfa579bc3da09f4538e25f38ebb2b0d (patch)
tree9dfcd0388b81549f0c9409a8e471db8e6140b2ce /development/android-tools/android-tools.SlackBuild
parent165eb6a56c2240af2647f68692c9eae7f2e8e839 (diff)
downloadslackbuilds-29023c9d3bfa579bc3da09f4538e25f38ebb2b0d.tar.gz
development/android-tools: Updated for version 6.0.1_r43.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/android-tools/android-tools.SlackBuild')
-rw-r--r--development/android-tools/android-tools.SlackBuild25
1 files changed, 13 insertions, 12 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 66aff73bf7..5319905bfa 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -25,11 +25,11 @@
PRGNAM=android-tools
-VERSION=${VERSION:-5.1.1_r4}
-SRC1=core-5b3aa21bc70d42b3fcb1764a1be04ab8db5ebfb9.tar.gz
-SRC2=extras-8e9fa76016a34ec53b83157032e38fad06af1135.tar.gz
-SRC3=libselinux-6608a1875b07370733d0f93f3a52febcef3442bf.tar.gz
-SRC4=f2fs-tools-3f4408b13665bd82dd7edf5c76ed9dccc3a3fce7.tar.gz
+VERSION=${VERSION:-6.0.1_r43}
+SRC1=core-ad54cfed4516292654c997910839153264ae00a0.tar.gz
+SRC2=extras-83eeed92430fc3f14c21cfc43d11fcecef6e8285.tar.gz
+SRC3=libselinux-943ed44a46ed95d557bf552b57fe61280a77489c.tar.gz
+SRC4=f2fs-tools-3686eecd8c8511ae7ecd7611a2f065b48b484b13.tar.gz
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -84,7 +84,10 @@ tar -xvf $CWD/$SRC4 -C f2fs-tools
#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/libselinux
#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/f2fs-tools
-cp -p $CWD/adbMakefile $CWD/fastbootMakefile .
+patch -p1 < $CWD/fix_build.patch
+
+# build.sh borrowed from Arch linux
+cp -p $CWD/build.sh .
chown -R root:root .
find . \
@@ -93,14 +96,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sed -e 's/f2fs_sparse_file = NULL/f2fs_sparse_file = 0/g' -i extras/f2fs_utils/f2fs_utils.c
-
-make -C core/adb -f $TMP/android-tools/adbMakefile
-make -C core/fastboot -f $TMP/android-tools/fastbootMakefile
+/bin/sh ./build.sh
mkdir -p $PKG/usr/bin
-install -Dm 755 core/adb/adb $PKG/usr/bin/adb
-install -Dm 755 core/fastboot/fastboot $PKG/usr/bin/fastboot
+install -Dm 755 adb $PKG/usr/bin/adb
+install -Dm 755 fastboot $PKG/usr/bin/fastboot
+install -Dm 755 mkbootimg $PKG/usr/bin/mkbootimg
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true