[arch-commits] Commit in android-tools/trunk (3 files)
Date: Sunday, November 15, 2020 @ 22:55:04 Author: anatolik Revision: 754926 upgpkg: android-tools 30.0.5-1 Modified: android-tools/trunk/PKGBUILD android-tools/trunk/build.ninja android-tools/trunk/fix_build_core.patch --+ PKGBUILD |8 build.ninja | 20 +++- fix_build_core.patch |4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-11-15 22:54:27 UTC (rev 754925) +++ PKGBUILD2020-11-15 22:55:04 UTC (rev 754926) @@ -3,8 +3,8 @@ # Contributor: Alucryd pkgname=android-tools -pkgver=30.0.4 -pkgrel=2 +pkgver=30.0.5 +pkgrel=1 _tag=platform-tools-$pkgver pkgdesc='Android platform tools' arch=(x86_64) @@ -60,9 +60,9 @@ 'SKIP' 'SKIP' 'SKIP' - '3e6dc3afe68447212b6dbca74962e9b24a8159b2' + '933dc30da1c3db9c85c3623d20341fcf64ed2253' 'd9dfac30245faa0a96968b96f3acd9ad536f4910' - 'cc295dc7726821ea9e74158d898a1ff80d291c61' + '4583e794158ef08cec8e586cd26bc152fe26695c' 'ce8314d6b1e05e3f4f7ae7828d225fbb07a2a55c' '1c025855a3e7ea351685843a0df45c52a7e674dd' '7004dbd0c193668827174880de6f8434de8ceaee') Modified: build.ninja === --- build.ninja 2020-11-15 22:54:27 UTC (rev 754925) +++ build.ninja 2020-11-15 22:55:04 UTC (rev 754926) @@ -7,7 +7,7 @@ CPPFLAGS = CXXFLAGS = LDFLAGS = -PLATFORM_TOOLS_VERSION = 30.0.4 +PLATFORM_TOOLS_VERSION = 30.0.5 rule cc @@ -133,6 +133,8 @@ cflags = -D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Ilibbase/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/src/include -Ibase/libs/androidfw/include -Inative/include -Icore/adb/crypto/include -Icore/adb/proto -Icore/adb/tls/include -Icore/adb/pairing_connection/include -Ilibziparchive/include -Icore/adb/pairing_auth/include build core/adb/socket_spec.cpp.o: cxx core/adb/socket_spec.cpp || core/adb/fastdeploy/proto/ApkEntry.pb.h core/adb/proto/key_type.pb.h core/adb/proto/app_processes.pb.h core/adb/proto/adb_known_hosts.pb.h core/adb/proto/pairing.pb.h core/adb/client/deployagent.inc core/adb/client/deployagentscript.inc cflags = -D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Ilibbase/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/src/include -Ibase/libs/androidfw/include -Inative/include -Icore/adb/crypto/include -Icore/adb/proto -Icore/adb/tls/include -Icore/adb/pairing_connection/include -Ilibziparchive/include -Icore/adb/pairing_auth/include +build core/adb/sysdeps/env.cpp.o: cxx core/adb/sysdeps/env.cpp || core/adb/fastdeploy/proto/ApkEntry.pb.h core/adb/proto/key_type.pb.h core/adb/proto/app_processes.pb.h core/adb/proto/adb_known_hosts.pb.h core/adb/proto/pairing.pb.h core/adb/client/deployagent.inc core/adb/client/deployagentscript.inc +cflags = -D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Ilibbase/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/src/include -Ibase/libs/androidfw/include -Inative/include -Icore/adb/crypto/include -Icore/adb/proto -Icore/adb/tls/include -Icore/adb/pairing_connection/include -Ilibziparchive/include -Icore/adb/pairing_auth/include build core/adb/sysdeps/errno.cpp.o: cxx core/adb/sysdeps/errno.cpp || core/adb/fastdeploy/proto/ApkEntry.pb.h core/adb/proto/key_type.pb.h core/adb/proto/app_processes.pb.h core/adb/proto/adb_known_hosts.pb.h core/adb/proto/pairing.pb.h core/adb/client/deployagent.inc core/adb/client/deployagentscript.inc cflags = -D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Ilibbase/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/src/include -Ibase/libs/androidfw/include -Inative/include -Icore/adb/crypto/include -Icore/adb/proto -Icore/adb/tls/include -Icore/adb/pairing_connection/include -Ilibziparchive/include -Icore/adb/pairing_auth/include build core/adb/sysdeps/posix/network.cpp.o: cxx core/adb/sysdeps/posix/network.cpp || core/adb/fastdeploy/proto/ApkEntry.pb.h core/adb/proto/key_type.pb.h core/adb/proto/app_processes.pb.h core/adb/proto/adb_known_hosts.pb.h core/adb/proto/pairing.pb.h core/adb/client/deployagent.inc core/adb/client/deployagentscript.inc @@ -176,17 +178,17 @@ build libbase/threads.cpp.o: cxx libbase/threads.cpp cflags = -DADB_HOST=1 -Ilibbase/include -Icore/include build core/liblog/log_event_list.cpp.o: cxx core/liblog/log_event_list.cpp -cflags = -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include -Ilibbase/include +cflags = -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/liblog/include -Icore/include -Ilibbase/include build core/liblog/log_event_write.cpp.o: cxx core/liblog/log_event_write.cpp -cflags = -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include
[arch-commits] Commit in android-tools/trunk (3 files)
Date: Saturday, May 16, 2020 @ 03:35:12
Author: anatolik
Revision: 628148
Use Android's version of boringssl project
This helps to avoid reading a file with commit sha1 and then checking out
upstream
with this sha1. We will checkout Android's git repository by its tag directly.
Android removes third_pary directory so we have to adjust CMakeLists.txt and use
system version of the libraries.
Added:
android-tools/trunk/boringssl-disable-thirdpartydeps.patch
Modified:
android-tools/trunk/PKGBUILD
android-tools/trunk/generate_build.rb
+
PKGBUILD | 16 ++--
boringssl-disable-thirdpartydeps.patch | 24
generate_build.rb | 10 +-
3 files changed, 39 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 02:33:17 UTC (rev 628147)
+++ PKGBUILD2020-05-16 03:35:12 UTC (rev 628148)
@@ -17,7 +17,7 @@
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)
+#_boringssl_commit=$(curl
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT
| base64 -d)
source=(git+https://android.googlesource.com/platform/frameworks/base#tag=$tag
git+https://android.googlesource.com/platform/frameworks/native#tag=$tag
git+https://android.googlesource.com/platform/system/core#tag=$tag
@@ -27,8 +27,8 @@
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=$tag
git+https://android.googlesource.com/platform/external/e2fsprogs#tag=$tag
git+https://android.googlesource.com/platform/external/avb#tag=$tag
-
#git+https://android.googlesource.com/platform/external/boringssl#tag=$tag
-
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
+
git+https://android.googlesource.com/platform/external/boringssl#tag=$tag
+
#git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
generate_build.rb
# deployagent.jar is a library built from Android sources.
# Building this java library requires a lot of dependencies:
@@ -43,6 +43,7 @@
# cp ./target/product/generic/system/framework/deployagent.jar .
deployagent.jar
fix_build_core.patch
+boringssl-disable-thirdpartydeps.patch
bash_completion.fastboot)
# Bash completion file was taken from
https://github.com/mbrubeck/android-completion
sha1sums=('SKIP'
@@ -55,9 +56,10 @@
'SKIP'
'SKIP'
'SKIP'
- '930c5d4b94f7cc09087fe599d4b868e7187abd74'
+ '4aec96639c5a16e75fac907bc5a8ea6a7efca047'
'd9dfac30245faa0a96968b96f3acd9ad536f4910'
'70abd4483233ee481490b3369dbdd492c57f'
+ '1c025855a3e7ea351685843a0df45c52a7e674dd'
'7004dbd0c193668827174880de6f8434de8ceaee')
prepare() {
@@ -70,11 +72,13 @@
cd "$srcdir"/mkbootimg
sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' unpack_bootimg.py
- mkdir -p "$srcdir"/boringssl/build
+ cd "$srcdir"/boringssl
+ patch -p1 < ../../boringssl-disable-thirdpartydeps.patch
+ mkdir -p "$srcdir"/boringssl/src/build
}
build() {
- (cd "$srcdir"/boringssl/build && cmake -GNinja ..; ninja crypto/libcrypto.a
ssl/libssl.a)
+ (cd "$srcdir"/boringssl/src/build && cmake -GNinja ..; ninja
crypto/libcrypto.a ssl/libssl.a)
PLATFORM_TOOLS_VERSION="$pkgver-$pkgrel" ./generate_build.rb > build.ninja
ninja
Added: boringssl-disable-thirdpartydeps.patch
===
--- boringssl-disable-thirdpartydeps.patch (rev 0)
+++ boringssl-disable-thirdpartydeps.patch 2020-05-16 03:35:12 UTC (rev
628148)
@@ -0,0 +1,24 @@
+commit a05f7bad3f07a4041e7011a629858a8b0921e9e0
+Author: Anatol Pomozov
+Date: Fri May 15 20:04:43 2020 -0700
+
+Do not use third-party dependency as it is missing in Android's version of
the repo
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 75bf9981..9ec8e81b 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -562,13 +562,6 @@ if(USE_CUSTOM_LIBCXX)
+ target_link_libraries(libcxx libcxxabi)
+ endif()
+
+-# Add minimal googletest targets. The provided one has many side-effects, and
+-# googletest has a very straightforward build.
+-add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
+-target_include_directories(boringssl_gtest PRIVATE third_party/googletest)
+-
+-include_directories(third_party/googletest/include)
+-
+ # Declare a dummy target to build all unit tests. Test targets should inject
+ # themselves as dependencies next to the
[arch-commits] Commit in android-tools/trunk (3 files)
Date: Monday, May 11, 2020 @ 06:47:38
Author: anatolik
Revision: 626247
upgpkg: android-tools 30.0.0-1
As usual a new update requires a lot of changes to the build script. This is
an inevitable price that we pay for partial mirroring of the Android build
system to reuse host-level software components.
Upstream android platform tools use libstdc++ from LLVM project. Arch does not
have this package in the repo thus we use libc++ for now.
There are minor source-level incompatibilities that are most likely caused by
the fact that we use libc++. Libc++ seems more strict when it comes to
including headers for particular POSIX functions. We have to patch "./core"
project and add required "#includes".
Android uses c++2a standard extensively including features that have been
added to compilers just recently. The latest release of android-tools
requires GCC10.
Android-tools requires boringssl. We compile libssl.a and libcrypo.a as static
libraries and then use it for linking with adb/fastboot. System openssl
libraries are not needed in this case.
Android uses an mdns library that is API incompatible with mdns we have at Arch.
Disable mdns-specific code for now.
Modified:
android-tools/trunk/PKGBUILD
android-tools/trunk/fix_build_core.patch
android-tools/trunk/generate_build.rb
--+
PKGBUILD | 20 +-
fix_build_core.patch | 94 +++--
generate_build.rb| 63 ++--
3 files changed, 138 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-11 06:09:42 UTC (rev 626246)
+++ PKGBUILD2020-05-11 06:47:38 UTC (rev 626247)
@@ -3,7 +3,7 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=29.0.6
+pkgver=30.0.0
pkgrel=1
tag=platform-tools-$pkgver
pkgdesc='Android platform tools'
@@ -10,10 +10,10 @@
arch=(x86_64)
url='http://tools.android.com/'
license=(Apache MIT)
-depends=(pcre2 libusb protobuf)
+depends=(pcre2 libusb protobuf brotli)
optdepends=('python: for mkbootimg script'
'python2: for unpack_bootimg & avbtool scripts')
-# depend on 'vim' for 'xxd' tool.
+# it depends on 'vim' because of 'xxd' tool.
makedepends=(git clang gtest ruby cmake ninja go vim)
provides=(fastboot adb)
conflicts=(fastboot adb)
@@ -27,6 +27,7 @@
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=$tag
git+https://android.googlesource.com/platform/external/e2fsprogs#tag=$tag
git+https://android.googlesource.com/platform/external/avb#tag=$tag
+
#git+https://android.googlesource.com/platform/external/boringssl#tag=$tag
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
generate_build.rb
# deployagent.jar is a library built from Android sources.
@@ -33,7 +34,7 @@
# Building this java library requires a lot of dependencies:
# java, protobuf-java, dex compiler, Android base libs.
# To avoid the complexity we prebuilt the lib from the Android sources directly
-# using following instructiuons:
+# using following instructions:
# (See https://wiki.archlinux.org/index.php/Android for context)
#
# source build/envsetup.sh
@@ -54,14 +55,12 @@
'SKIP'
'SKIP'
'SKIP'
- '37992d0d7547b7deb703f3232ec124a4c6b96aef'
+ '930c5d4b94f7cc09087fe599d4b868e7187abd74'
'd9dfac30245faa0a96968b96f3acd9ad536f4910'
- '31779cd6c0df710be9589bd2ee4f697f59b100fd'
+ '70abd4483233ee481490b3369dbdd492c57f'
'7004dbd0c193668827174880de6f8434de8ceaee')
prepare() {
- PLATFORM_TOOLS_VERSION="$pkgver-$pkgrel" LDFLAGS='-Wl,-z,relro,-z,now'
./generate_build.rb > build.ninja
-
cd "$srcdir"/core
patch -p1 < ../fix_build_core.patch
@@ -71,10 +70,13 @@
cd "$srcdir"/mkbootimg
sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' unpack_bootimg.py
- mkdir -p "$srcdir"/boringssl/build && cd "$srcdir"/boringssl/build && cmake
-GNinja ..; ninja crypto/libcrypto.a
+ mkdir -p "$srcdir"/boringssl/build
}
build() {
+ (cd "$srcdir"/boringssl/build && cmake -GNinja ..; ninja crypto/libcrypto.a
ssl/libssl.a)
+
+ PLATFORM_TOOLS_VERSION="$pkgver-$pkgrel" ./generate_build.rb > build.ninja
ninja
}
Modified: fix_build_core.patch
===
--- fix_build_core.patch2020-05-11 06:09:42 UTC (rev 626246)
+++ fix_build_core.patch2020-05-11 06:47:38 UTC (rev 626247)
@@ -1,8 +1,8 @@
diff --git a/adb/adb.cpp b/adb/adb.cpp
-index 1ec145b25c..b6e943f6ee 100644
+index 08d3904c71..a73362acec 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
-@@ -44,8 +44,6 @@
+@@ -45,8 +45,6 @@
#include
#include
#include
@@ -11,7 +11,7 @@
#include "adb_auth.h"
#include "adb_io.h"
-@@ -66,10 +64,10 @@ std::string adb_version() {
+@@ -74,10 +72,10 @@ std::string
[arch-commits] Commit in android-tools/trunk (3 files)
Date: Thursday, September 12, 2019 @ 03:17:05
Author: anatolik
Revision: 509335
upgpkg: android-tools 29.0.3-1
Modified:
android-tools/trunk/PKGBUILD
android-tools/trunk/fix_build_core.patch
Deleted:
android-tools/trunk/fix_build_e2fsprogs.patch
---+
PKGBUILD | 11 +--
fix_build_core.patch | 128
fix_build_e2fsprogs.patch | 43 --
3 files changed, 3 insertions(+), 179 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-09-11 23:52:36 UTC (rev 509334)
+++ PKGBUILD2019-09-12 03:17:05 UTC (rev 509335)
@@ -3,8 +3,8 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=29.0.2
-pkgrel=2
+pkgver=29.0.3
+pkgrel=1
tag=platform-tools-$pkgver
pkgdesc='Android platform tools'
arch=(x86_64)
@@ -26,7 +26,6 @@
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
generate_build.rb
fix_build_core.patch
-fix_build_e2fsprogs.patch
bash_completion.fastboot)
# Bash completion file was taken from
https://github.com/mbrubeck/android-completion
sha1sums=('SKIP'
@@ -38,8 +37,7 @@
'SKIP'
'SKIP'
'afca7974ad8658e52fd028ead12ad0a959d63273'
- '99a1618bd93af8ef3ff2cca893e950a0346021fe'
- 'bcebdf1e706a3c3da175234840c6ee4e13652012'
+ 'e7f02cd6529dad54b4bdfd35e34b2cb9cb70cdd4'
'7004dbd0c193668827174880de6f8434de8ceaee')
prepare() {
@@ -48,9 +46,6 @@
cd "$srcdir"/core
patch -p1 < ../fix_build_core.patch
- cd "$srcdir"/e2fsprogs
- patch -p1 < ../fix_build_e2fsprogs.patch
-
cd "$srcdir"/avb
sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
Modified: fix_build_core.patch
===
--- fix_build_core.patch2019-09-11 23:52:36 UTC (rev 509334)
+++ fix_build_core.patch2019-09-12 03:17:05 UTC (rev 509335)
@@ -43,14 +43,6 @@
index 53f01a0ce5..5be0d91085 100644
--- a/adb/client/usb_libusb.cpp
+++ b/adb/client/usb_libusb.cpp
-@@ -22,6 +22,7 @@
- #include
-
- #include
-+#include
- #include
- #include
- #include
@@ -30,7 +31,7 @@
#include
#include
@@ -60,90 +52,6 @@
#include
#include
-diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp
-index 81b8306436..b4f09caab8 100644
a/adb/client/usb_linux.cpp
-+++ b/adb/client/usb_linux.cpp
-@@ -29,6 +29,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-diff --git a/adb/fdevent/fdevent.h b/adb/fdevent/fdevent.h
-index ccb0c9221c..2424252f5d 100644
a/adb/fdevent/fdevent.h
-+++ b/adb/fdevent/fdevent.h
-@@ -20,6 +20,7 @@
- #include
- #include
-
-+#include
- #include
- #include
- #include
-diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp
-index c5c227568f..99686f15fb 100644
a/adb/sysdeps/posix/network.cpp
-+++ b/adb/sysdeps/posix/network.cpp
-@@ -22,6 +22,7 @@
- #include
-
- #include
-+#include
-
- #include
- #include
-diff --git a/adb/types.h b/adb/types.h
-index cd1366dfbe..1eb7e4b6d7 100644
a/adb/types.h
-+++ b/adb/types.h
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
-index 296995efe2..48269b6750 100644
a/base/errors_unix.cpp
-+++ b/base/errors_unix.cpp
-@@ -17,6 +17,7 @@
- #include "android-base/errors.h"
-
- #include
-+#include
-
- namespace android {
- namespace base {
-diff --git a/base/file.cpp b/base/file.cpp
-index 3dfcfbb7ec..1b5c0203f0 100644
a/base/file.cpp
-+++ b/base/file.cpp
-@@ -26,6 +26,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
-diff --git a/base/logging.cpp b/base/logging.cpp
-index f89168c0fc..da522019dc 100644
a/base/logging.cpp
-+++ b/base/logging.cpp
-@@ -24,6 +24,7 @@
- #include
- #include
- #include
-+#include
-
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 8923f409df..d245a577ff 100644
--- a/fastboot/fastboot.cpp
@@ -180,39 +88,3 @@
std::vector mke2fs_args = {mke2fs_path.c_str(), "-t",
"ext4", "-b"};
std::string block_size_str = std::to_string(block_size);
-diff --git a/fs_mgr/liblp/reader.cpp b/fs_mgr/liblp/reader.cpp
-index dcee6d2d86..6fcd613ab6 100644
a/fs_mgr/liblp/reader.cpp
-+++ b/fs_mgr/liblp/reader.cpp
-@@ -19,6 +19,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-diff --git a/fs_mgr/liblp/writer.cpp b/fs_mgr/liblp/writer.cpp
-index bffcb7e6e1..6b36a641a6 100644
a/fs_mgr/liblp/writer.cpp
-+++ b/fs_mgr/liblp/writer.cpp
-@@ -20,6 +20,7 @@
- #include
-
- #include
-+#include
-
- #include
- #include
-diff --git a/libziparchive/zip_archive.cc
[arch-commits] Commit in android-tools/trunk (3 files)
Date: Tuesday, August 13, 2019 @ 17:56:23
Author: anatolik
Revision: 499074
Add an extra selinux include path instead of patching the sources
Modified:
android-tools/trunk/PKGBUILD
android-tools/trunk/generate_build.rb
Deleted:
android-tools/trunk/fix_build_selinux.patch
-+
PKGBUILD|7 +--
fix_build_selinux.patch | 26 --
generate_build.rb |2 +-
3 files changed, 2 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-13 17:51:34 UTC (rev 499073)
+++ PKGBUILD2019-08-13 17:56:23 UTC (rev 499074)
@@ -26,7 +26,6 @@
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
generate_build.rb
fix_build_core.patch
-fix_build_selinux.patch
fix_build_e2fsprogs.patch
bash_completion.fastboot)
# Bash completion file was taken from
https://github.com/mbrubeck/android-completion
@@ -38,9 +37,8 @@
'SKIP'
'SKIP'
'SKIP'
- 'ff8613a331b9026f2f413768f88ccd10e26149bf'
+ 'afca7974ad8658e52fd028ead12ad0a959d63273'
'99a1618bd93af8ef3ff2cca893e950a0346021fe'
- 'b2ccf6dac3577d230f910e668ae70af6051fee46'
'bcebdf1e706a3c3da175234840c6ee4e13652012'
'7004dbd0c193668827174880de6f8434de8ceaee')
@@ -50,9 +48,6 @@
cd $srcdir/core
patch -p1 < ../fix_build_core.patch
- cd $srcdir/selinux
- patch -p1 < ../fix_build_selinux.patch
-
cd $srcdir/e2fsprogs
patch -p1 < ../fix_build_e2fsprogs.patch
Deleted: fix_build_selinux.patch
===
--- fix_build_selinux.patch 2019-08-13 17:51:34 UTC (rev 499073)
+++ fix_build_selinux.patch 2019-08-13 17:56:23 UTC (rev 499074)
@@ -1,26 +0,0 @@
-diff --git a/libsepol/src/private.h b/libsepol/src/private.h
-index b884c23b..447fa64b 100644
a/libsepol/src/private.h
-+++ b/libsepol/src/private.h
-@@ -14,7 +14,7 @@
- #endif
-
- #include
--#include
-+#include "dso.h"
-
- #ifdef __APPLE__
- #define __BYTE_ORDER BYTE_ORDER
-diff --git a/libsepol/src/util.c b/libsepol/src/util.c
-index a4008882..d79a8335 100644
a/libsepol/src/util.c
-+++ b/libsepol/src/util.c
-@@ -27,7 +27,7 @@
- #include
- #include
- #include
--#include
-+#include "dso.h"
-
- struct val_to_name {
- unsigned int val;
Modified: generate_build.rb
===
--- generate_build.rb 2019-08-13 17:51:34 UTC (rev 499073)
+++ generate_build.rb 2019-08-13 17:56:23 UTC (rev 499074)
@@ -272,7 +272,7 @@
hierarchy.c
kernel_to_common.c
)
-libsepol = compile(expand("selinux/libsepol/src", libsepolfiles),
"-Iselinux/libsepol/include")
+libsepol = compile(expand("selinux/libsepol/src", libsepolfiles),
"-Iselinux/libsepol/include -Iselinux/libsepol/src")
link("fastboot", libfsmgr + libsparse + libzip + libcutils + liblog + libutil
+ libbase + libext4 + f2fs + libselinux + libsepol + libfastboot +
libdiagnoseusb + boringssl, "-lz -lpcre2-8 -lpthread -ldl")
[arch-commits] Commit in android-tools/trunk (3 files)
Date: Monday, August 5, 2019 @ 04:28:55
Author: anatolik
Revision: 497424
upgpkg: android-tools 29.0.2-1
Modified:
android-tools/trunk/PKGBUILD
android-tools/trunk/fix_build_core.patch
android-tools/trunk/generate_build.rb
--+
PKGBUILD | 12 +++-
fix_build_core.patch | 18 +++---
generate_build.rb|5 +++--
3 files changed, 25 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-05 04:20:08 UTC (rev 497423)
+++ PKGBUILD2019-08-05 04:28:55 UTC (rev 497424)
@@ -3,7 +3,7 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=29.0.1
+pkgver=29.0.2
pkgrel=1
tag=platform-tools-$pkgver
pkgdesc='Android platform tools'
@@ -18,6 +18,7 @@
_boringssl_commit=`curl
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT
| base64 -d`
source=(git+https://android.googlesource.com/platform/system/core#tag=$tag
git+https://android.googlesource.com/platform/system/extras#tag=$tag
+
git+https://android.googlesource.com/platform/system/tools/mkbootimg#tag=$tag
git+https://android.googlesource.com/platform/external/selinux#tag=$tag
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=$tag
git+https://android.googlesource.com/platform/external/e2fsprogs#tag=$tag
@@ -36,8 +37,9 @@
'SKIP'
'SKIP'
'SKIP'
- '8510f5031c386c855f9be15cd8055237db290a33'
- '16cf92e7ddbec79a672152a07837474ad8ad6356'
+ 'SKIP'
+ 'ff8613a331b9026f2f413768f88ccd10e26149bf'
+ '99a1618bd93af8ef3ff2cca893e950a0346021fe'
'b2ccf6dac3577d230f910e668ae70af6051fee46'
'bcebdf1e706a3c3da175234840c6ee4e13652012'
'7004dbd0c193668827174880de6f8434de8ceaee')
@@ -67,7 +69,7 @@
package(){
install -m755 -d "$pkgdir"/usr/bin
install -m755 -t "$pkgdir"/usr/bin fastboot adb mke2fs.android e2fsdroid
ext2simg avb/avbtool
- install -Dm 755 core/mkbootimg/mkbootimg.py "$pkgdir"/usr/bin/mkbootimg
- install -Dm 755 core/mkbootimg/unpack_bootimg.py
"$pkgdir"/usr/bin/unpack_bootimg
+ install -Dm 755 mkbootimg/mkbootimg.py "$pkgdir"/usr/bin/mkbootimg
+ install -Dm 755 mkbootimg/unpack_bootimg.py "$pkgdir"/usr/bin/unpack_bootimg
install -Dm 644 bash_completion.fastboot
"$pkgdir"/usr/share/bash-completion/completions/fastboot
}
Modified: fix_build_core.patch
===
--- fix_build_core.patch2019-08-05 04:20:08 UTC (rev 497423)
+++ fix_build_core.patch2019-08-05 04:28:55 UTC (rev 497424)
@@ -72,6 +72,18 @@
#include
#include
#include
+diff --git a/adb/fdevent/fdevent.h b/adb/fdevent/fdevent.h
+index ccb0c9221c..2424252f5d 100644
+--- a/adb/fdevent/fdevent.h
b/adb/fdevent/fdevent.h
+@@ -20,6 +20,7 @@
+ #include
+ #include
+
++#include
+ #include
+ #include
+ #include
diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp
index c5c227568f..99686f15fb 100644
--- a/adb/sysdeps/posix/network.cpp
@@ -133,7 +145,7 @@
// For getprogname(3) or program_invocation_short_name.
#if defined(__ANDROID__) || defined(__APPLE__)
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
-index 39abc4a3b1..4bea3bc84b 100644
+index 8923f409df..d245a577ff 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -58,9 +58,7 @@
@@ -146,7 +158,7 @@
#include
#include
-@@ -1678,7 +1676,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
+@@ -1749,7 +1747,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stderr, nullptr, _IONBF, 0);
} else if (name == "version") {
@@ -193,7 +205,7 @@
#include
#include
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
-index f4b6c74f8c..6b3610cfe3 100644
+index c95b03542e..ae8ebb93a4 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -30,6 +30,7 @@
Modified: generate_build.rb
===
--- generate_build.rb 2019-08-05 04:20:08 UTC (rev 497423)
+++ generate_build.rb 2019-08-05 04:28:55 UTC (rev 497424)
@@ -77,7 +77,8 @@
transport.cpp
transport_local.cpp
transport_usb.cpp
- fdevent.cpp
+ fdevent/fdevent.cpp
+ fdevent/fdevent_poll.cpp
shell_service_protocol.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')
@@ -175,7 +176,7 @@
main.cpp
fastboot_driver.cpp
)
-libfastboot = compile(expand("core/fastboot", fastbootfiles),
'-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\""
[arch-commits] Commit in android-tools/trunk (3 files)
Date: Wednesday, December 6, 2017 @ 00:06:17
Author: anatolik
Revision: 272348
upgpkg: android-tools 8.1.0_r1-1
Modified:
android-tools/trunk/PKGBUILD
android-tools/trunk/fix_build_core.patch
android-tools/trunk/generate_build.rb
--+
PKGBUILD |8
fix_build_core.patch | 32
generate_build.rb| 13 +++--
3 files changed, 39 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-05 23:28:42 UTC (rev 272347)
+++ PKGBUILD2017-12-06 00:06:17 UTC (rev 272348)
@@ -4,7 +4,7 @@
# Contributor: Alucryd
pkgname=android-tools
-pkgver=8.0.0_r17
+pkgver=8.1.0_r1
pkgrel=1
pkgdesc='Android platform tools'
arch=(x86_64)
@@ -13,7 +13,7 @@
depends=(pcre2 libusb)
optdepends=('python: for mkbootimg script')
makedepends=(git clang gtest ruby cmake ninja go-pie)
-_boringssl_commit=bbfe603519bc54fbc4c8dd87efe1ed385df550b4 # keep it in sync
with android
https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
+_boringssl_commit=14308731e5446a73ac2258688a9688b524483cb6 # keep it in sync
with android
https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver
@@ -29,8 +29,8 @@
'SKIP'
'SKIP'
'SKIP'
- '12b6bc1cbf850958850c3e4a5bc19d8b32f845b9'
- '45e41bab3633bb0be96b238aae3164a5c90721f1'
+ 'fa0e4579f2f26a0e0efe53549e9a91ef3a334eff'
+ '640db48e8e915f8c7f525dd044f16a3b502d4689'
'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
'7004dbd0c193668827174880de6f8434de8ceaee')
Modified: fix_build_core.patch
===
--- fix_build_core.patch2017-12-05 23:28:42 UTC (rev 272347)
+++ fix_build_core.patch2017-12-06 00:06:17 UTC (rev 272348)
@@ -1,5 +1,5 @@
diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
-index 7adb26213..7596c123b 100644
+index 81201995a0..cfd60fce97 100644
--- a/adb/client/usb_libusb.cpp
+++ b/adb/client/usb_libusb.cpp
@@ -21,6 +21,7 @@
@@ -19,8 +19,20 @@
#include
#include
+diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp
+index 45da5af4a1..ee3bf06994 100644
+--- a/adb/sysdeps/posix/network.cpp
b/adb/sysdeps/posix/network.cpp
+@@ -21,6 +21,7 @@
+ #include
+
+ #include
++#include
+
+ #include "adb_unique_fd.h"
+
diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
-index 296995efe..48269b675 100644
+index 296995efe2..48269b6750 100644
--- a/base/errors_unix.cpp
+++ b/base/errors_unix.cpp
@@ -17,6 +17,7 @@
@@ -32,7 +44,7 @@
namespace android {
namespace base {
diff --git a/base/file.cpp b/base/file.cpp
-index d4e58942c..ca7655fa2 100644
+index a2f28878e8..0aa185e972 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -22,6 +22,7 @@
@@ -44,7 +56,7 @@
#include
#include
diff --git a/base/logging.cpp b/base/logging.cpp
-index 6357b4ba7..3c7dbce13 100644
+index 6357b4ba73..3c7dbce131 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -23,6 +23,7 @@
@@ -55,3 +67,15 @@
// For getprogname(3) or program_invocation_short_name.
#if defined(__ANDROID__) || defined(__APPLE__)
+diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp
+index bd668735a3..6168f2e248 100644
+--- a/libsparse/sparse_read.cpp
b/libsparse/sparse_read.cpp
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
Modified: generate_build.rb
===
--- generate_build.rb 2017-12-05 23:28:42 UTC (rev 272347)
+++ generate_build.rb 2017-12-06 00:06:17 UTC (rev 272348)
@@ -85,7 +85,7 @@
adb_auth_host.cpp
shell_service_protocol.cpp
)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_REVISION="\"$PKGVER\""
-DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb
-Icore/libcrypto_utils/include -Iboringssl/include')
+libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\""
-DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb
-Icore/libcrypto_utils/include -Iboringssl/include')
adbfiles = %w(
console.cpp
@@ -100,6 +100,7 @@
client/usb_dispatch.cpp
client/usb_linux.cpp
client/usb_libusb.cpp
+ sysdeps/posix/network.cpp
)
libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1
-Icore/include -Icore/base/include -Icore/adb')
@@ -110,6 +111,7 @@
stringprintf.cpp
strings.cpp
errors_unix.cpp
+ test_utils.cpp
)
libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1
