summaryrefslogtreecommitdiffstats
path: root/development/android-tools/android-tools.SlackBuild
diff options
context:
space:
mode:
author Philip van der Hoeven2017-11-01 22:07:17 +0100
committer David Spencer2017-11-04 00:18:35 +0100
commitdedec715f4b01118c874076fa29dab0eafd0e61b (patch)
tree25382bc1c3f5169480c959e3e6da99253cb27795 /development/android-tools/android-tools.SlackBuild
parent5926dc0a445b9cd11f28ec2b4ea5bfcfd2adcb00 (diff)
downloadslackbuilds-dedec715f4b01118c874076fa29dab0eafd0e61b.tar.gz
development/android-tools: Updated for version 8.0.0_r24.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'development/android-tools/android-tools.SlackBuild')
-rw-r--r--development/android-tools/android-tools.SlackBuild42
1 files changed, 30 insertions, 12 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 885478a27b..8e141f5fbd 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for android-tools
# Thanks to the Arch linux maintainers for the makefiles
-# Copyright 2016 Philip van der Hoeven, Almere, NL
+# Copyright 2016, 2017 Philip van der Hoeven, Almere, NL
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,11 +25,12 @@
PRGNAM=android-tools
-VERSION=${VERSION:-7.1.0_r4}
-SRC1=core-75a38b87f3044a48fee359b49766c64a87a34c74.tar.gz
-SRC2=extras-614a6c7cf8296302de559ad7bf65d3ebd43ca023.tar.gz
-SRC3=libselinux-9d7eba17309e2d8761354e054c8800cf34402549.tar.gz
-SRC4=f2fs-tools-5bd943d50d103eb6f48a72f199a49dce4feeb61a.tar.gz
+VERSION=${VERSION:-8.0.0_r24}
+SRC1=core-6cd85e2a89347e0a107f59e38ece61fa19e6da78.tar.gz
+SRC2=extras-af2dce5151ad478673401211dd71ae1579d2b5be.tar.gz
+SRC3=selinux-be29c2550c3ff6551a56048c075a88da01b46cab.tar.gz
+SRC4=f2fs-tools-b8baf1712d991541141bb0bdddd625f527e6d41f.tar.gz
+SRC5=boringssl-58e449904e248f34bdfc2be7a609c58bcb0257b7.tar.gz
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -74,20 +75,29 @@ mkdir core
tar -xvf $CWD/$SRC1 -C core
mkdir extras
tar -xvf $CWD/$SRC2 -C extras
-mkdir libselinux
-tar -xvf $CWD/$SRC3 -C libselinux
+mkdir selinux
+tar -xvf $CWD/$SRC3 -C selinux
mkdir f2fs-tools
tar -xvf $CWD/$SRC4 -C f2fs-tools
+mkdir boringssl
+tar -xvf $CWD/$SRC5 -C boringssl
#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/core
#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/extras
#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
-patch -p0 < $CWD/fix_build.patch
-
# generate_build.rb borrowed from Arch Linux
-ruby $CWD/generate_build.rb > build.sh
+# And thanks to Alan Alberghini for the make_ext4fs patch.
+PKGVER=$VERSION ruby $CWD/generate_build.rb > build.ninja
+
+cd core
+patch -p1 < $CWD/fix_build_core.patch
+cd ..
+
+cd selinux
+patch -p1 < $CWD/fix_build_selinux.patch
+cd ..
chown -R root:root .
find . \
@@ -96,12 +106,20 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-/bin/sh ./build.sh
+# Build boringssl
+mkdir -p boringssl/build
+cd boringssl/build
+cmake -GNinja ..
+ninja
+cd ../..
+
+ninja
mkdir -p $PKG/usr/bin
install -Dm 755 adb $PKG/usr/bin/adb
install -Dm 755 fastboot $PKG/usr/bin/fastboot
install -Dm 755 core/mkbootimg/mkbootimg $PKG/usr/bin/mkbootimg
+install -Dm 755 make_ext4fs $PKG/usr/bin/make_ext4fs
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