author | Anatol Pomozov
<anatolik@archlinux.org> 2020-03-05 00:47:50 UTC |
committer | Anatol Pomozov
<anatolik@archlinux.org> 2020-03-05 00:47:50 UTC |
parent | e26941abb84b2f196b763c9ad13f5c8262863b52 |
PKGBUILD | +4 | -4 |
generate_build.rb | +5 | -6 |
diff --git a/PKGBUILD b/PKGBUILD index aa9d248..399b466 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alucryd <alucryd at gmail dot com> pkgname=android-tools -pkgver=29.0.5 -pkgrel=2 +pkgver=29.0.6 +pkgrel=1 tag=platform-tools-$pkgver pkgdesc='Android platform tools' arch=(x86_64) @@ -14,7 +14,7 @@ depends=(pcre2 libusb protobuf) optdepends=('python: for mkbootimg script' 'python2: for unpack_bootimg & avbtool scripts') # depend on 'vim' for 'xxd' tool. -makedepends=(git clang gtest ruby cmake ninja go-pie vim) +makedepends=(git clang gtest ruby cmake ninja go vim) provides=(fastboot adb) conflicts=(fastboot adb) _boringssl_commit=$(curl https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT | base64 -d) @@ -54,7 +54,7 @@ sha1sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'acb02d8c048411fd21d00d57909a45aa6a6a6a7a' + '37992d0d7547b7deb703f3232ec124a4c6b96aef' 'd9dfac30245faa0a96968b96f3acd9ad536f4910' '31779cd6c0df710be9589bd2ee4f697f59b100fd' '7004dbd0c193668827174880de6f8434de8ceaee') diff --git a/generate_build.rb b/generate_build.rb index 2c74ee0..76b6d61 100755 --- a/generate_build.rb +++ b/generate_build.rb @@ -109,6 +109,7 @@ adbdfiles = %w( transport.cpp transport_local.cpp transport_usb.cpp + types.cpp ) libadbd = compile(expand("core/adb", adbdfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Icore/diagnose_usb/include') @@ -158,6 +159,7 @@ basefiles = %w( chrono_utils.cpp errors_unix.cpp file.cpp + liblog_symbols.cpp logging.cpp mapped_file.cpp parsenetaddress.cpp @@ -169,16 +171,14 @@ basefiles = %w( libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include") logfiles = %w( - fake_log_device.cpp - fake_writer.cpp log_event_list.cpp log_event_write.cpp - logger_lock.cpp logger_name.cpp logger_write.cpp logprint.cpp + properties.cpp ) -liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include") +liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include -Icore/base/include") cutilsfiles = %w( android_get_control_file.cpp @@ -307,12 +307,11 @@ libsepolfiles = %w( debug.c ebitmap.c expand.c - genbools.c - genusers.c hashtab.c hierarchy.c kernel_to_common.c mls.c + optimize.c policydb.c policydb_convert.c policydb_public.c