development/android-tools: Updated for version 6.0.1_r43.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 130 insertions, 132 deletions

diff --git a/development/android-tools/adbMakefile b/development/android-tools/adbMakefile
deleted file mode 100644
index fd54ba0192242..0000000000000
--- a/development/android-tools/adbMakefile
+++ /dev/null
@@ -1,44 +0,0 @@
-SRCS+= adb.c
-SRCS+= adb_auth_host.c
-SRCS+= adb_client.c
-SRCS+= commandline.c
-SRCS+= console.c
-SRCS+= fdevent.c
-SRCS+= file_sync_client.c
-SRCS+= get_my_path_linux.c
-SRCS+= services.c
-SRCS+= sockets.c
-SRCS+= transport.c
-SRCS+= transport_local.c
-SRCS+= transport_usb.c
-SRCS+= usb_linux.c
-SRCS+= usb_vendors.c
-
-VPATH+= ../libcutils
-SRCS+= load_file.c
-SRCS+= socket_inaddr_any_server.c
-SRCS+= socket_local_client.c
-SRCS+= socket_local_server.c
-SRCS+= socket_loopback_client.c
-SRCS+= socket_loopback_server.c
-SRCS+= socket_network_client.c
-
-VPATH+= ../libzipfile
-SRCS+= centraldir.c
-SRCS+= zipfile.c
-
-CPPFLAGS+= -DADB_HOST=1
-CPPFLAGS+= -DHAVE_FORKEXEC=1
-CPPFLAGS+= -DHAVE_OFF64_T=1
-CPPFLAGS+= -I.
-CPPFLAGS+= -I../include
-
-LIBS+= -lcrypto -lpthread -lz
-
-OBJS= $(SRCS:.c=.o)
-
-all: adb
-
-adb: $(OBJS)
-		cc -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
-
diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild
index 66aff73bf761a..5319905bfa21b 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
diff --git a/development/android-tools/android-tools.info b/development/android-tools/android-tools.info
index 7cbbddd65c3d6..f5387fce91905 100644
--- a/development/android-tools/android-tools.info
+++ b/development/android-tools/android-tools.info
@@ -1,14 +1,14 @@
 PRGNAM="android-tools"
-VERSION="5.1.1_r4"
+VERSION="6.0.1_r43"
 HOMEPAGE="http://developer.android.com/sdk/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/5.1.1_r4/core-5b3aa21bc70d42b3fcb1764a1be04ab8db5ebfb9.tar.gz \
-          https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/5.1.1_r4/extras-8e9fa76016a34ec53b83157032e38fad06af1135.tar.gz \
-          https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/5.1.1_r4/libselinux-6608a1875b07370733d0f93f3a52febcef3442bf.tar.gz \
-          https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/5.1.1_r4/f2fs-tools-3f4408b13665bd82dd7edf5c76ed9dccc3a3fce7.tar.gz"
-MD5SUM="04909a7881167eb1bb5a1ce02c82535d \
-	03a38d3c7711d6e5a2c01a5153e1eba9 \
-	777d521427f2367267574ef80159a020 \
-	ace5fb268eb50ddc8a36ff2c88d2c5ee"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/6.0.1_r43/core-ad54cfed4516292654c997910839153264ae00a0.tar.gz \
+          https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/6.0.1_r43/extras-83eeed92430fc3f14c21cfc43d11fcecef6e8285.tar.gz \
+          https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/6.0.1_r43/libselinux-943ed44a46ed95d557bf552b57fe61280a77489c.tar.gz \
+          https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/6.0.1_r43/f2fs-tools-3686eecd8c8511ae7ecd7611a2f065b48b484b13.tar.gz"
+MD5SUM="311b52e7376744b761109d3426413e38 \
+	9e85d7a739d8f0d3efe9d1e755b55e21 \
+	699ebcb55aa01f3664e84cc4ccfe2d8a \
+	bb8565b0617c7552ed272592d44ae2e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/android-tools/build.sh b/development/android-tools/build.sh
new file mode 100644
index 0000000000000..73a1ad6b9afcf
--- /dev/null
+++ b/development/android-tools/build.sh
@@ -0,0 +1,77 @@
+gcc -o core/libmincrypt/dsa_sig.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/dsa_sig.c
+gcc -o core/libmincrypt/p256_ec.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/p256_ec.c
+gcc -o core/libmincrypt/rsa.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/rsa.c
+gcc -o core/libmincrypt/sha.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/sha.c
+gcc -o core/libmincrypt/p256.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/p256.c
+gcc -o core/libmincrypt/p256_ecdsa.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/p256_ecdsa.c
+gcc -o core/libmincrypt/sha256.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/libmincrypt/sha256.c
+gcc -o core/mkbootimg/mkbootimg.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include -c core/mkbootimg/mkbootimg.c
+g++ -o mkbootimg  $LDFLAGS core/libmincrypt/dsa_sig.c.o core/libmincrypt/p256_ec.c.o core/libmincrypt/rsa.c.o core/libmincrypt/sha.c.o core/libmincrypt/p256.c.o core/libmincrypt/p256_ecdsa.c.o core/libmincrypt/sha256.c.o core/mkbootimg/mkbootimg.c.o
+g++ -o core/adb/adb.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb.cpp
+g++ -o core/adb/adb_auth.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_auth.cpp
+g++ -o core/adb/adb_io.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_io.cpp
+g++ -o core/adb/adb_listeners.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_listeners.cpp
+g++ -o core/adb/adb_utils.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_utils.cpp
+g++ -o core/adb/sockets.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/sockets.cpp
+g++ -o core/adb/transport.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/transport.cpp
+g++ -o core/adb/transport_local.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/transport_local.cpp
+g++ -o core/adb/transport_usb.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/transport_usb.cpp
+g++ -o core/adb/fdevent.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/fdevent.cpp
+g++ -o core/adb/get_my_path_linux.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/get_my_path_linux.cpp
+g++ -o core/adb/usb_linux.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/usb_linux.cpp
+g++ -o core/adb/adb_auth_host.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_auth_host.cpp
+g++ -o core/adb/adb_main.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_main.cpp
+g++ -o core/adb/console.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -c core/adb/console.cpp
+g++ -o core/adb/commandline.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -c core/adb/commandline.cpp
+g++ -o core/adb/adb_client.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -c core/adb/adb_client.cpp
+g++ -o core/adb/services.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -c core/adb/services.cpp
+g++ -o core/adb/file_sync_client.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -c core/adb/file_sync_client.cpp
+g++ -o core/base/file.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/file.cpp
+g++ -o core/base/stringprintf.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/stringprintf.cpp
+g++ -o core/base/strings.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/strings.cpp
+gcc -o core/liblog/logd_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logd_write.c
+gcc -o core/liblog/log_event_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_write.c
+gcc -o core/liblog/fake_log_device.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_log_device.c
+gcc -o core/libcutils/load_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/load_file.c
+gcc -o core/libcutils/socket_inaddr_any_server.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_inaddr_any_server.c
+gcc -o core/libcutils/socket_local_client.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_client.c
+gcc -o core/libcutils/socket_local_server.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_server.c
+gcc -o core/libcutils/socket_loopback_client.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_client.c
+gcc -o core/libcutils/socket_loopback_server.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_server.c
+gcc -o core/libcutils/socket_network_client.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_network_client.c
+g++ -o adb -lrt -ldl -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/liblog/logd_write.c.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/libcutils/load_file.c.o core/libcutils/socket_inaddr_any_server.c.o core/libcutils/socket_local_client.c.o core/libcutils/socket_local_server.c.o core/libcutils/socket_loopback_client.c.o core/libcutils/socket_loopback_server.c.o core/libcutils/socket_network_client.c.o core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_utils.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/adb_main.cpp.o core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o
+gcc -o core/fastboot/protocol.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/protocol.c
+gcc -o core/fastboot/engine.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/engine.c
+g++ -o core/fastboot/bootimg_utils.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/bootimg_utils.cpp
+g++ -o core/fastboot/fastboot.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fastboot.cpp
+gcc -o core/fastboot/util.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util.c
+gcc -o core/fastboot/fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fs.c
+gcc -o core/fastboot/usb_linux.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/usb_linux.c
+gcc -o core/fastboot/util_linux.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/include -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util_linux.c
+gcc -o core/libsparse/backed_block.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/backed_block.c
+gcc -o core/libsparse/output_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/output_file.c
+gcc -o core/libsparse/sparse.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse.c
+gcc -o core/libsparse/sparse_crc32.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_crc32.c
+gcc -o core/libsparse/sparse_err.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_err.c
+gcc -o core/libsparse/sparse_read.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_read.c
+g++ -o core/libziparchive/zip_archive.cc.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -Icore/base/include -Icore/include -c core/libziparchive/zip_archive.cc
+g++ -o core/libutils/FileMap.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -Icore/include -c core/libutils/FileMap.cpp
+gcc -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/make_ext4fs.c
+gcc -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4fixup.c
+gcc -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_utils.c
+gcc -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/allocate.c
+gcc -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/contents.c
+gcc -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/extent.c
+gcc -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/indirect.c
+gcc -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/sha1.c
+gcc -o extras/ext4_utils/wipe.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/wipe.c
+gcc -o extras/ext4_utils/crc16.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/crc16.c
+gcc -o extras/ext4_utils/ext4_sb.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_sb.c
+gcc -o libselinux/src/callbacks.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/callbacks.c
+gcc -o libselinux/src/check_context.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/check_context.c
+gcc -o libselinux/src/freecon.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/freecon.c
+gcc -o libselinux/src/init.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/init.c
+gcc -o libselinux/src/label.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label.c
+gcc -o libselinux/src/label_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_file.c
+gcc -o libselinux/src/label_android_property.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_android_property.c
+g++ -o fastboot -lz -lpcre $LDFLAGS core/libsparse/backed_block.c.o core/libsparse/output_file.c.o core/libsparse/sparse.c.o core/libsparse/sparse_crc32.c.o core/libsparse/sparse_err.c.o core/libsparse/sparse_read.c.o core/libziparchive/zip_archive.cc.o core/liblog/logd_write.c.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o extras/ext4_utils/make_ext4fs.c.o extras/ext4_utils/ext4fixup.c.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/allocate.c.o extras/ext4_utils/contents.c.o extras/ext4_utils/extent.c.o extras/ext4_utils/indirect.c.o extras/ext4_utils/sha1.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/crc16.c.o extras/ext4_utils/ext4_sb.c.o libselinux/src/callbacks.c.o libselinux/src/check_context.c.o libselinux/src/freecon.c.o libselinux/src/init.c.o libselinux/src/label.c.o libselinux/src/label_file.c.o libselinux/src/label_android_property.c.o core/fastboot/protocol.c.o core/fastboot/engine.c.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.c.o core/fastboot/fs.c.o core/fastboot/usb_linux.c.o core/fastboot/util_linux.c.o
diff --git a/development/android-tools/fastbootMakefile b/development/android-tools/fastbootMakefile
deleted file mode 100644
index 079c628b2d9e2..0000000000000
--- a/development/android-tools/fastbootMakefile
+++ /dev/null
@@ -1,67 +0,0 @@
-SRCS+=bootimg.c
-SRCS+=engine.c
-SRCS+=fastboot.c
-SRCS+=protocol.c
-SRCS+=usb_linux.c
-SRCS+=util_linux.c
-SRCS+=util.c
-SRCS+=fs.c
-
-VPATH+= ../libsparse
-SRCS+= backed_block.c
-SRCS+= output_file.c
-SRCS+= sparse.c
-SRCS+= sparse_crc32.c
-SRCS+= sparse_err.c
-SRCS+= sparse_read.c
-
-VPATH+= ../libzipfile
-SRCS+= centraldir.c
-SRCS+= zipfile.c
-
-VPATH+= ../../extras/ext4_utils
-SRCS+= allocate.c
-SRCS+= contents.c
-SRCS+= crc16.c
-SRCS+= ext4_utils.c
-SRCS+= ext4_sb.c
-SRCS+= extent.c
-SRCS+= indirect.c
-SRCS+= make_ext4fs.c
-SRCS+= sha1.c
-SRCS+= uuid.c
-SRCS+= wipe.c
-
-VPATH+= ../../extras/f2fs_utils
-SRCS+= f2fs_utils.c
-SRCS+= f2fs_dlutils.c
-SRCS+= f2fs_ioutils.c
-
-VPATH+= ../../libselinux/src
-SRCS+= callbacks.c
-SRCS+= check_context.c
-SRCS+= freecon.c
-SRCS+= init.c
-SRCS+= label.c
-SRCS+= label_android_property.c
-SRCS+= label_file.c
-
-CPPFLAGS+= -I../include
-CPPFLAGS+= -I../libsparse/include
-CPPFLAGS+= -I../mkbootimg
-CPPFLAGS+= -I../../extras/ext4_utils
-CPPFLAGS+= -I../../extras/f2fs_utils/
-CPPFLAGS+= -I../../libselinux/include
-CPPFLAGS+= -I../../f2fs-tools/include
-CPPFLAGS+= -I../../f2fs-tools/mkfs
-CPPFLAGS+= -DHAVE_OFF64_T=1
-CPPFLAGS+= -std=gnu99
-
-LIBS+= -lz -ldl -lpcre
-
-OBJS= $(SRCS:.c=.o)
-
-all: fastboot
-
-fastboot: $(OBJS)
-		cc -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
diff --git a/development/android-tools/fix_build.patch b/development/android-tools/fix_build.patch
new file mode 100644
index 0000000000000..5747f1ddddbb9
--- /dev/null
+++ b/development/android-tools/fix_build.patch
@@ -0,0 +1,31 @@
+--- a/core/base/file.cpp
++++ b/core/base/file.cpp
+@@ -20,6 +20,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <string.h>
+ 
+ #include <string>
+ 
+--- a/core/liblog/log_read.c
++++ b/core/liblog/log_read.c
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <sys/cdefs.h>
+ #include <unistd.h>
++#include <sys/user.h>
+ 
+ #include <cutils/list.h>
+ #include <cutils/sockets.h>
+
+--- a/libselinux/src/label_internal.h
++++ b/libselinux/src/label_internal.h
+@@ -10,6 +10,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ #include <selinux/selinux.h>
+ #include <selinux/label.h>
+ #include "dso.h"