[arch-commits] Commit in android-tools/trunk (3 files)
Anatol Pomozov
anatolik at archlinux.org
Sun Nov 15 22:55:05 UTC 2020
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
===================================================================
--- PKGBUILD 2020-11-15 22:54:27 UTC (rev 754925)
+++ PKGBUILD 2020-11-15 22:55:04 UTC (rev 754926)
@@ -3,8 +3,8 @@
# Contributor: Alucryd <alucryd at gmail dot com>
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 -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/logger_name.cpp.o: cxx core/liblog/logger_name.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/logger_write.cpp.o: cxx core/liblog/logger_write.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/logprint.cpp.o: cxx core/liblog/logprint.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/properties.cpp.o: cxx core/liblog/properties.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/libcutils/android_get_control_file.cpp.o: cxx core/libcutils/android_get_control_file.cpp
cflags = -D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Ilibbase/include
build core/libcutils/canned_fs_config.cpp.o: cxx core/libcutils/canned_fs_config.cpp
@@ -211,7 +213,7 @@
cflags = -D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Ilibbase/include
build core/diagnose_usb/diagnose_usb.cpp.o: cxx core/diagnose_usb/diagnose_usb.cpp
cflags = -Icore/include -Ilibbase/include -Icore/diagnose_usb/include
-build core/libcrypto_utils/android_pubkey.c.o: cc core/libcrypto_utils/android_pubkey.c
+build core/libcrypto_utils/android_pubkey.cpp.o: cxx core/libcrypto_utils/android_pubkey.cpp
cflags = -Icore/libcrypto_utils/include -Iboringssl/src/include
build core/fastboot/bootimg_utils.cpp.o: cxx core/fastboot/bootimg_utils.cpp
cflags = -DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Ilibbase/include -Icore/include -Icore/adb -Icore/libsparse/include -Imkbootimg/include/bootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Ilibziparchive/include -Icore/fs_mgr/liblp/include -Icore/diagnose_usb/include -Iavb
@@ -609,5 +611,5 @@
cflags = -Ie2fsprogs/lib -Icore/libsparse/include
build ext2simg: link e2fsprogs/contrib/android/ext2simg.c.o e2fsprogs/lib/blkid/cache.c.o e2fsprogs/lib/blkid/dev.c.o e2fsprogs/lib/blkid/devname.c.o e2fsprogs/lib/blkid/devno.c.o e2fsprogs/lib/blkid/getsize.c.o e2fsprogs/lib/blkid/llseek.c.o e2fsprogs/lib/blkid/probe.c.o e2fsprogs/lib/blkid/read.c.o e2fsprogs/lib/blkid/resolve.c.o e2fsprogs/lib/blkid/save.c.o e2fsprogs/lib/blkid/tag.c.o e2fsprogs/lib/e2p/encoding.c.o e2fsprogs/lib/e2p/feature.c.o e2fsprogs/lib/e2p/hashstr.c.o e2fsprogs/lib/e2p/mntopts.c.o e2fsprogs/lib/e2p/ostype.c.o e2fsprogs/lib/e2p/parse_num.c.o e2fsprogs/lib/e2p/uuid.c.o e2fsprogs/lib/et/com_err.c.o e2fsprogs/lib/et/error_message.c.o e2fsprogs/lib/et/et_name.c.o e2fsprogs/lib/ext2fs/alloc.c.o e2fsprogs/lib/ext2fs/alloc_sb.c.o e2fsprogs/lib/ext2fs/alloc_stats.c.o e2fsprogs/lib/ext2fs/alloc_tables.c.o e2fsprogs/lib/ext2fs/atexit.c.o e2fsprogs/lib/ext2fs/badblocks.c.o e2fsprogs/lib/ext2fs/bb_inode.c.o e2fsprogs/lib/ext2fs/bitmaps.c.o e2fsprogs/lib/ext2fs/bitops.c.
o e2fsprogs/lib/ext2fs/blkmap64_ba.c.o e2fsprogs/lib/ext2fs/blkmap64_rb.c.o e2fsprogs/lib/ext2fs/blknum.c.o e2fsprogs/lib/ext2fs/block.c.o e2fsprogs/lib/ext2fs/bmap.c.o e2fsprogs/lib/ext2fs/closefs.c.o e2fsprogs/lib/ext2fs/crc16.c.o e2fsprogs/lib/ext2fs/crc32c.c.o e2fsprogs/lib/ext2fs/csum.c.o e2fsprogs/lib/ext2fs/dirblock.c.o e2fsprogs/lib/ext2fs/dir_iterate.c.o e2fsprogs/lib/ext2fs/expanddir.c.o e2fsprogs/lib/ext2fs/ext2_err.c.o e2fsprogs/lib/ext2fs/ext_attr.c.o e2fsprogs/lib/ext2fs/extent.c.o e2fsprogs/lib/ext2fs/fallocate.c.o e2fsprogs/lib/ext2fs/fileio.c.o e2fsprogs/lib/ext2fs/freefs.c.o e2fsprogs/lib/ext2fs/gen_bitmap64.c.o e2fsprogs/lib/ext2fs/gen_bitmap.c.o e2fsprogs/lib/ext2fs/get_num_dirs.c.o e2fsprogs/lib/ext2fs/getsectsize.c.o e2fsprogs/lib/ext2fs/getsize.c.o e2fsprogs/lib/ext2fs/hashmap.c.o e2fsprogs/lib/ext2fs/i_block.c.o e2fsprogs/lib/ext2fs/ind_block.c.o e2fsprogs/lib/ext2fs/initialize.c.o e2fsprogs/lib/ext2fs/inline.c.o e2fsprogs/lib/ext2fs/inline_data.c.o e2fsprogs
/lib/ext2fs/inode.c.o e2fsprogs/lib/ext2fs/io_manager
.c.o e2fsprogs/lib/ext2fs/ismounted.c.o e2fsprogs/lib/ext2fs/link.c.o e2fsprogs/lib/ext2fs/llseek.c.o e2fsprogs/lib/ext2fs/lookup.c.o e2fsprogs/lib/ext2fs/mkdir.c.o e2fsprogs/lib/ext2fs/mkjournal.c.o e2fsprogs/lib/ext2fs/mmp.c.o e2fsprogs/lib/ext2fs/namei.c.o e2fsprogs/lib/ext2fs/newdir.c.o e2fsprogs/lib/ext2fs/nls_utf8.c.o e2fsprogs/lib/ext2fs/openfs.c.o e2fsprogs/lib/ext2fs/progress.c.o e2fsprogs/lib/ext2fs/punch.c.o e2fsprogs/lib/ext2fs/rbtree.c.o e2fsprogs/lib/ext2fs/read_bb.c.o e2fsprogs/lib/ext2fs/read_bb_file.c.o e2fsprogs/lib/ext2fs/res_gdt.c.o e2fsprogs/lib/ext2fs/rw_bitmaps.c.o e2fsprogs/lib/ext2fs/sha512.c.o e2fsprogs/lib/ext2fs/sparse_io.c.o e2fsprogs/lib/ext2fs/symlink.c.o e2fsprogs/lib/ext2fs/undo_io.c.o e2fsprogs/lib/ext2fs/unix_io.c.o e2fsprogs/lib/ext2fs/valid_blk.c.o e2fsprogs/lib/support/dict.c.o e2fsprogs/lib/support/mkquota.c.o e2fsprogs/lib/support/parse_qtype.c.o e2fsprogs/lib/support/plausible.c.o e2fsprogs/lib/support/prof_err.c.o e2fsprogs/lib/support/profil
e.c.o e2fsprogs/lib/support/quotaio.c.o e2fsprogs/lib/support/quotaio_tree.c.o e2fsprogs/lib/support/quotaio_v2.c.o e2fsprogs/lib/uuid/clear.c.o e2fsprogs/lib/uuid/gen_uuid.c.o e2fsprogs/lib/uuid/isnull.c.o e2fsprogs/lib/uuid/pack.c.o e2fsprogs/lib/uuid/parse.c.o e2fsprogs/lib/uuid/unpack.c.o e2fsprogs/lib/uuid/unparse.c.o e2fsprogs/misc/create_inode.c.o core/libsparse/backed_block.cpp.o core/libsparse/output_file.cpp.o core/libsparse/sparse.cpp.o core/libsparse/sparse_crc32.cpp.o core/libsparse/sparse_err.cpp.o core/libsparse/sparse_read.cpp.o libbase/chrono_utils.cpp.o libbase/errors_unix.cpp.o libbase/file.cpp.o libbase/liblog_symbols.cpp.o libbase/logging.cpp.o libbase/mapped_file.cpp.o libbase/parsebool.cpp.o libbase/parsenetaddress.cpp.o libbase/stringprintf.cpp.o libbase/strings.cpp.o libbase/test_utils.cpp.o libbase/threads.cpp.o libziparchive/zip_archive.cc.o libziparchive/zip_error.cpp.o libziparchive/zip_cd_entry_map.cc.o core/liblog/log_event_list.cpp.o core/liblog/log_e
vent_write.cpp.o core/liblog/logger_name.cpp.o core/l
iblog/logger_write.cpp.o core/liblog/logprint.cpp.o core/liblog/properties.cpp.o core/libutils/FileMap.cpp.o core/libutils/SharedBuffer.cpp.o core/libutils/String16.cpp.o core/libutils/String8.cpp.o core/libutils/VectorImpl.cpp.o core/libutils/Unicode.cpp.o
ldflags = -lz -lpthread
-build adb: link libbase/chrono_utils.cpp.o libbase/errors_unix.cpp.o libbase/file.cpp.o libbase/liblog_symbols.cpp.o libbase/logging.cpp.o libbase/mapped_file.cpp.o libbase/parsebool.cpp.o libbase/parsenetaddress.cpp.o libbase/stringprintf.cpp.o libbase/strings.cpp.o libbase/test_utils.cpp.o libbase/threads.cpp.o core/liblog/log_event_list.cpp.o core/liblog/log_event_write.cpp.o core/liblog/logger_name.cpp.o core/liblog/logger_write.cpp.o core/liblog/logprint.cpp.o core/liblog/properties.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/canned_fs_config.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/load_file.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/threads.cpp.o core/libutils/FileMap.cpp.o core/libutils/SharedBuffer.cpp.o core/lib
utils/String16.cpp.o core/libutils/String8.cpp.o core/libutils/VectorImpl.cpp.o core/libutils/Unicode.cpp.o core/adb/adb.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/fdevent/fdevent.cpp.o core/adb/fdevent/fdevent_poll.cpp.o core/adb/fdevent/fdevent_epoll.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/types.cpp.o core/adb/client/adb_client.cpp.o core/adb/client/adb_install.cpp.o core/adb/client/adb_wifi.cpp.o core/adb/client/auth.cpp.o core/adb/client/bugreport.cpp.o core/adb/client/commandline.cpp.o core/adb/client/console.cpp.o core/adb/client/fastdeploy.cpp.o core/adb/client/fastdeploycallbacks.cpp.o core/adb/client/file_sync_client.cpp.o core/adb/client/incremental.cpp.o core/adb/client/incremental_server.cpp.o core/adb/client/incremental_utils.cpp.o core/adb/client/line_printer.cpp.o core/adb/client/main.cpp.o core/adb/client/pairing/pairing_client.cpp.o c
ore/adb/client/transport_local.cpp.o core/adb/client/
transport_usb.cpp.o core/adb/client/usb_dispatch.cpp.o core/adb/client/usb_libusb.cpp.o core/adb/client/usb_linux.cpp.o core/adb/crypto/key.cpp.o core/adb/crypto/rsa_2048_key.cpp.o core/adb/crypto/x509_generator.cpp.o core/adb/fastdeploy/deploypatchgenerator/apk_archive.cpp.o core/adb/fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp.o core/adb/fastdeploy/deploypatchgenerator/patch_utils.cpp.o core/adb/pairing_auth/aes_128_gcm.cpp.o core/adb/pairing_auth/pairing_auth.cpp.o core/adb/pairing_connection/pairing_connection.cpp.o core/adb/services.cpp.o core/adb/socket_spec.cpp.o core/adb/sysdeps/errno.cpp.o core/adb/sysdeps/posix/network.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/tls/adb_ca_list.cpp.o core/adb/tls/tls_connection.cpp.o core/diagnose_usb/diagnose_usb.cpp.o core/libcrypto_utils/android_pubkey.c.o base/libs/androidfw/LocaleData.cpp.o base/libs/androidfw/ResourceTypes.cpp.o base/libs/androidfw/TypeWrappers.cpp.o base/libs/androidfw/ZipFileRO.cpp.o libziparchive/zip_a
rchive.cc.o libziparchive/zip_error.cpp.o libziparchive/zip_cd_entry_map.cc.o core/adb/fastdeploy/proto/ApkEntry.pb.cc.o core/adb/proto/key_type.pb.cc.o core/adb/proto/app_processes.pb.cc.o core/adb/proto/adb_known_hosts.pb.cc.o core/adb/proto/pairing.pb.cc.o
+build adb: link libbase/chrono_utils.cpp.o libbase/errors_unix.cpp.o libbase/file.cpp.o libbase/liblog_symbols.cpp.o libbase/logging.cpp.o libbase/mapped_file.cpp.o libbase/parsebool.cpp.o libbase/parsenetaddress.cpp.o libbase/stringprintf.cpp.o libbase/strings.cpp.o libbase/test_utils.cpp.o libbase/threads.cpp.o core/liblog/log_event_list.cpp.o core/liblog/log_event_write.cpp.o core/liblog/logger_name.cpp.o core/liblog/logger_write.cpp.o core/liblog/logprint.cpp.o core/liblog/properties.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/canned_fs_config.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/load_file.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/threads.cpp.o core/libutils/FileMap.cpp.o core/libutils/SharedBuffer.cpp.o core/lib
utils/String16.cpp.o core/libutils/String8.cpp.o core/libutils/VectorImpl.cpp.o core/libutils/Unicode.cpp.o core/adb/adb.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/fdevent/fdevent.cpp.o core/adb/fdevent/fdevent_poll.cpp.o core/adb/fdevent/fdevent_epoll.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/types.cpp.o core/adb/client/adb_client.cpp.o core/adb/client/adb_install.cpp.o core/adb/client/adb_wifi.cpp.o core/adb/client/auth.cpp.o core/adb/client/bugreport.cpp.o core/adb/client/commandline.cpp.o core/adb/client/console.cpp.o core/adb/client/fastdeploy.cpp.o core/adb/client/fastdeploycallbacks.cpp.o core/adb/client/file_sync_client.cpp.o core/adb/client/incremental.cpp.o core/adb/client/incremental_server.cpp.o core/adb/client/incremental_utils.cpp.o core/adb/client/line_printer.cpp.o core/adb/client/main.cpp.o core/adb/client/pairing/pairing_client.cpp.o c
ore/adb/client/transport_local.cpp.o core/adb/client/
transport_usb.cpp.o core/adb/client/usb_dispatch.cpp.o core/adb/client/usb_libusb.cpp.o core/adb/client/usb_linux.cpp.o core/adb/crypto/key.cpp.o core/adb/crypto/rsa_2048_key.cpp.o core/adb/crypto/x509_generator.cpp.o core/adb/fastdeploy/deploypatchgenerator/apk_archive.cpp.o core/adb/fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp.o core/adb/fastdeploy/deploypatchgenerator/patch_utils.cpp.o core/adb/pairing_auth/aes_128_gcm.cpp.o core/adb/pairing_auth/pairing_auth.cpp.o core/adb/pairing_connection/pairing_connection.cpp.o core/adb/services.cpp.o core/adb/socket_spec.cpp.o core/adb/sysdeps/env.cpp.o core/adb/sysdeps/errno.cpp.o core/adb/sysdeps/posix/network.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/tls/adb_ca_list.cpp.o core/adb/tls/tls_connection.cpp.o core/diagnose_usb/diagnose_usb.cpp.o core/libcrypto_utils/android_pubkey.cpp.o base/libs/androidfw/LocaleData.cpp.o base/libs/androidfw/ResourceTypes.cpp.o base/libs/androidfw/TypeWrappers.cpp.o base/libs/androidfw/ZipFil
eRO.cpp.o libziparchive/zip_archive.cc.o libziparchive/zip_error.cpp.o libziparchive/zip_cd_entry_map.cc.o core/adb/fastdeploy/proto/ApkEntry.pb.cc.o core/adb/proto/key_type.pb.cc.o core/adb/proto/app_processes.pb.cc.o core/adb/proto/adb_known_hosts.pb.cc.o core/adb/proto/pairing.pb.cc.o
ldflags = -Wl,--whole-archive boringssl/src/build/crypto/libcrypto.a boringssl/src/build/ssl/libssl.a -Wl,--no-whole-archive -lpthread -lusb-1.0 -lprotobuf -lz -llz4 -lbrotlidec -lbrotlienc -lzstd
Modified: fix_build_core.patch
===================================================================
--- fix_build_core.patch 2020-11-15 22:54:27 UTC (rev 754925)
+++ fix_build_core.patch 2020-11-15 22:55:04 UTC (rev 754926)
@@ -201,7 +201,7 @@
#include <android-base/logging.h>
#include <android-base/strings.h>
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
-index 4ca6a6a69..a8b4a510f 100644
+index 4bf791ecf..42c48d816 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -59,10 +59,8 @@
@@ -215,7 +215,7 @@
#include <sparse/sparse.h>
#include <ziparchive/zip_archive.h>
-@@ -1859,7 +1857,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
+@@ -1863,7 +1861,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stderr, nullptr, _IONBF, 0);
} else if (name == "version") {
More information about the arch-commits
mailing list