summaryrefslogtreecommitdiffstats
path: root/development/android-tools/android-tools.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'development/android-tools/android-tools.SlackBuild')
-rw-r--r--development/android-tools/android-tools.SlackBuild40
1 files changed, 27 insertions, 13 deletions
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 8e141f5fbd..d967c127d6 100644
--- a/development/android-tools/android-tools.SlackBuild
+++ b/development/android-tools/android-tools.SlackBuild
@@ -25,13 +25,13 @@
PRGNAM=android-tools
-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
-
+VERSION=${VERSION:-9.0.0_r18}
+SRC1=core-c9602275fc7dae822d22ba36c933d29f4556d6aa.tar.gz
+SRC2=e2fsprogs-fecf0a211618bbed183ebf58d5bf489105bed72c.tar.gz
+SRC3=extras-9d680761912ab259ffd35b05c880b9e49d800bc8.tar.gz
+SRC4=f2fs-tools-d2d127499ebdfaa681df4c13a303a7d0445f1e80.tar.gz
+SRC5=selinux-0d8f825909d3e600facbf23be4758877f98c2602.tar.gz
+SRC6=boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,19 +73,25 @@ cd $TMP/android-tools
mkdir core
tar -xvf $CWD/$SRC1 -C core
+mkdir e2fsprogs
+tar -xvf $CWD/$SRC2 -C e2fsprogs
mkdir extras
-tar -xvf $CWD/$SRC2 -C extras
-mkdir selinux
-tar -xvf $CWD/$SRC3 -C selinux
+tar -xvf $CWD/$SRC3 -C extras
mkdir f2fs-tools
tar -xvf $CWD/$SRC4 -C f2fs-tools
+mkdir selinux
+tar -xvf $CWD/$SRC5 -C selinux
mkdir boringssl
-tar -xvf $CWD/$SRC5 -C boringssl
+tar -xvf $CWD/$SRC6 -C boringssl
+## android.googlesource.com stuff takes android-$VERSION as a tag
#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/selinux
+#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/e2fsprogs
#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/f2fs-tools
+## boringssl commit id is from https://android.googlesource.com/platform/external/boringssl/+/$VERSION/BORINGSSL_REVISION
+#git clone https://boringssl.googlesource.com/boringssl
# generate_build.rb borrowed from Arch Linux
# And thanks to Alan Alberghini for the make_ext4fs patch.
@@ -95,6 +101,10 @@ cd core
patch -p1 < $CWD/fix_build_core.patch
cd ..
+cd e2fsprogs
+patch -p1 < $CWD/fix_build_e2fsprogs.patch
+cd ..
+
cd selinux
patch -p1 < $CWD/fix_build_selinux.patch
cd ..
@@ -119,7 +129,11 @@ 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
+install -Dm 755 mke2fs.android $PKG/usr/bin/mke2fs.android
+install -Dm 755 e2fsdroid $PKG/usr/bin/e2fsdroid
+install -Dm 755 ext2simg $PKG/usr/bin/ext2simg
+
+install -Dm 644 $CWD/bash_completion.fastboot $PKG/usr/share/bash-completion/completions/fastboot
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