diff --git a/srcpkgs/android-tools/files/generate_build.rb b/srcpkgs/android-tools/files/generate_build.rb index e9319557b62..c7674446998 100755 --- a/srcpkgs/android-tools/files/generate_build.rb +++ b/srcpkgs/android-tools/files/generate_build.rb @@ -22,7 +22,7 @@ def compile(sources, cflags) lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS' when '.cpp', '.cc' cc = 'cxx' - lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS' + lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS' else raise "Unknown extension #{ext}" end @@ -133,17 +133,17 @@ logfiles = %w( liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include') cutilsfiles = %w( - load_file.c - socket_local_client_unix.c - socket_network_client_unix.c - socket_local_server_unix.c + load_file.cpp + socket_local_client_unix.cpp + socket_network_client_unix.cpp + socket_local_server_unix.cpp sockets_unix.cpp - socket_inaddr_any_server_unix.c + socket_inaddr_any_server_unix.cpp sockets.cpp android_get_control_file.cpp - threads.c + threads.cpp fs_config.cpp - canned_fs_config.c + canned_fs_config.cpp ) libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include') @@ -176,8 +176,8 @@ fastbootfiles = %w( tcp.cpp udp.cpp ) -libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include') - +libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg') + sparsefiles = %w( backed_block.c output_file.c @@ -189,11 +189,8 @@ sparsefiles = %w( libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include') f2fsfiles = %w( - f2fs_utils.c - f2fs_ioutils.c - f2fs_dlutils.c ) -f2fs = compile(expand('extras/f2fs_utils', f2fsfiles), '-Iextras/f2fs_utils -If2fs-tools/include -If2fs-tools/mkfs -Icore/libsparse/include -Iselinux/libselinux/include') +f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include") zipfiles = %w( zip_archive.cc @@ -206,16 +203,8 @@ utilfiles = %w( libutil = compile(expand('core/libutils', utilfiles), '-Icore/include') ext4files = %w( - make_ext4fs.c - ext4fixup.c ext4_utils.c - allocate.c - contents.c - extent.c - indirect.c - sha1.c wipe.c - crc16.c ext4_sb.c ) libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include') @@ -332,6 +321,7 @@ libext2fsfiles = %w( lib/ext2fs/get_num_dirs.c lib/ext2fs/getsectsize.c lib/ext2fs/getsize.c + lib/ext2fs/hashmap.c lib/ext2fs/i_block.c lib/ext2fs/ind_block.c lib/ext2fs/initialize.c @@ -356,6 +346,7 @@ libext2fsfiles = %w( lib/ext2fs/read_bb_file.c lib/ext2fs/res_gdt.c lib/ext2fs/rw_bitmaps.c + lib/ext2fs/sha512.c lib/ext2fs/sparse_io.c lib/ext2fs/symlink.c lib/ext2fs/undo_io.c @@ -378,7 +369,7 @@ libext2fsfiles = %w( lib/uuid/unparse.c misc/create_inode.c ) -libext2fs = compile(expand('e2fsprogs', libext2fsfiles), '-Ie2fsprogs/lib -Icore/libsparse/include') +libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include") mke2fsfiles = %w( @@ -396,13 +387,12 @@ e2fsdroidfiles = %w( contrib/android/e2fsdroid.c contrib/android/basefs_allocator.c contrib/android/block_range.c - contrib/android/hashmap.c contrib/android/base_fs.c contrib/android/fsmap.c contrib/android/block_list.c contrib/android/perms.c ) -e2fsdroid = compile(expand('e2fsprogs', e2fsdroidfiles), '-Ie2fsprogs/lib -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc') +e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc") link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8') diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 7310e02548e..68361b8945f 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -3,31 +3,31 @@ pkgname=android-tools # NOTE: not all upstream updates has code changes for the parts # of android used by android-tools. Check for diff with: # curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1 -version=8.1.0r14 -revision=2 +version=9.0.0r3 +revision=1 _distver=${version/r/_r} create_wrksrc=yes hostmakedepends="ruby cmake ninja perl go" makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel" short_desc="Android platform tools (adb and fastboot)" -maintainer="Eivind Uggedal " -license="Apache-2.0 ISC GPL-2 MIT" +maintainer="John " +license="Apache-2.0, ISC, GPL-2.0-only, MIT" homepage="http://developer.android.com/tools/help/adb.html" _baseurl=https://android.googlesource.com/platform distfiles=" - ${_baseurl}/system/core/+archive/ac8169f45dc9e5332d3ec24d0b14f812668b0c8e.tar.gz>core.tar.gz - ${_baseurl}/system/extras/+archive/e563ed1bca5ea0421f654eef82d758ec25c10bdd.tar.gz>extras.tar.gz - ${_baseurl}/external/selinux/+archive/90efe04c55f82a7ea166c913405758fd91bc9aa9.tar.gz>selinux.tar.gz - ${_baseurl}/external/f2fs-tools/+archive/a3f779d308a10d7e6b87cf0134445e7378de4770.tar.gz>f2fs-tools.tar.gz - ${_baseurl}/external/e2fsprogs/+archive/6bdf355a7c96ddd5eb867778d857de82fca793a5.tar.gz>e2fsprogs.tar.gz - https://boringssl.googlesource.com/boringssl/+archive/a20bb7ff8bb5057065a2e7941249773f9676cf45.tar.gz>boringssl.tar.gz" + ${_baseurl}/system/core/+archive/android-${_distver}.tar.gz>core.tar.gz + ${_baseurl}/system/extras/+archive/android-${_distver}.tar.gz>extras.tar.gz + ${_baseurl}/external/selinux/+archive/android-${_distver}.tar.gz>selinux.tar.gz + ${_baseurl}/external/f2fs-tools/+archive/android-${_distver}.tar.gz>f2fs-tools.tar.gz + ${_baseurl}/external/e2fsprogs/+archive/android-${_distver}.tar.gz>e2fsprogs.tar.gz + https://boringssl.googlesource.com/boringssl/+archive/3359.tar.gz>boringssl.tar.gz" # Contents checksums because the tarballs change with every download -checksum="@ce40cf2757bdd87d458655dc00d8ad835c69304ecab88faa7eb7e514712ba98d - @7f697f84f3454658ecc609620be344f3496603605158304f2cd1055f143a07c6 - @4c7d9b0650f47e83f75088c3fbbedab45e9f1a15081fa20f25104558eb81e406 - @ae8c85b3db0f5bdc9b01eacb8b0490e5a34c9d20a9ed962d8b9942b3451c6111 - @e4ab1880f0f043da29a04f1c446155f365933a4e46a9f4e8865ec104f64a982b - @748945a2c1f50c40286c963bd4e7a08a8e5bd450a6dc71a9de1a2b451d614a38" +checksum="@6c4e5d93ef8d543a0d7f3a208cccc7b708176eb193352b0bbff6f53c6a7188df + @9257b1a098c8012f154ed47795093e12040b562345a2ae889fc06db931fc5b0c + @9f2b5e379eca4c56e2d422598831bfd7bdf2b7b3c3d011ce513c7603aa46b574 + @47b98c4ec5f037379b0b4e237d7cac87452ecf3aa7882114f7715a9995e959ad + @e98509632e865e792dc4b344b0a1ada0662dda7571534fa7c5d1a8902dcfb0f4 + @9ec3dd8c7f6ec5f4d8b60e22d8dcba3dc4432763ec8a637c05ba24d3b58b2826" nocross="error: requested alignment 64 is larger than 8 [-Werror=attributes]"