[patch] android-tools-9.0.0-fno-common.patch

android-tools-9.0.0-fno-common.patch (text/plain), 43.09 KB, created by Peter Levine on 2020-05-26 17:48:09 UTC

Bug: https://bugs.gentoo.org/706946

--- a/build.ninja
+++ b/build.ninja
@@ -103,6 +103,8 @@
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include
 build core/liblog/logger_lock.c.o: cc core/liblog/logger_lock.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include
+build core/liblog/logger_read.c.o: cc core/liblog/logger_read.c
+    cflags = -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include
 build core/liblog/local_logger.c.o: cc core/liblog/local_logger.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include
 build core/liblog/fake_writer.c.o: cc core/liblog/fake_writer.c
@@ -139,7 +141,7 @@
     cflags = -std=gnu++17 $CXXFLAGS $CPPFLAGS -Icore/include -Icore/base/include
 build core/libcrypto_utils/android_pubkey.c.o: cc core/libcrypto_utils/android_pubkey.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libcrypto_utils/include -Iboringssl/include
-build adb: link core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.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/bugreport.cpp.o core/adb/line_printer.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/transport_mdns_unsupported.cpp.o core/adb/fdevent.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/socket_spec.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 core/adb/sysdeps_unix.cpp.o core/adb/sysdeps/errno.cpp.o core/adb/client/main.cpp.o core/adb/client/usb_dispatch.cpp.o core/adb/client/usb_linux.cpp.o core/adb/client/usb_libusb.cpp.o core/adb/sysdeps/posix/network.cpp.o core/adb/diagnose_usb.cpp.o core/libcrypto_utils/android_pubkey.c.o boringssl/build/crypto/libcrypto.a
+build adb: link core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/logger_read.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.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/bugreport.cpp.o core/adb/line_printer.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/transport_mdns_unsupported.cpp.o core/adb/fdevent.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/socket_spec.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 core/adb/sysdeps_unix.cpp.o core/adb/sysdeps/errno.cpp.o core/adb/client/main.cpp.o core/adb/client/usb_dispatch.cpp.o core/adb/client/usb_linux.cpp.o core/adb/client/usb_libusb.cpp.o core/adb/sysdeps/posix/network.cpp.o core/adb/diagnose_usb.cpp.o core/libcrypto_utils/android_pubkey.c.o boringssl/build/crypto/libcrypto.a
     ldflags = -lpthread -lusb-1.0 $LDFLAGS
 build core/fastboot/protocol.cpp.o: cxx core/fastboot/protocol.cpp
     cflags = -std=gnu++17 $CXXFLAGS $CPPFLAGS -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
@@ -277,7 +279,7 @@
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Iselinux/libsepol/include
 build selinux/libsepol/src/hierarchy.c.o: cc selinux/libsepol/src/hierarchy.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Iselinux/libsepol/include
-build fastboot: link 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.cpp.o core/libziparchive/zip_archive.cc.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/ext4_sb.c.o selinux/libselinux/src/callbacks.c.o selinux/libselinux/src/check_context.c.o selinux/libselinux/src/freecon.c.o selinux/libselinux/src/init.c.o selinux/libselinux/src/label.c.o selinux/libselinux/src/label_file.c.o selinux/libselinux/src/label_support.c.o selinux/libselinux/src/setrans_client.c.o selinux/libselinux/src/regex.c.o selinux/libselinux/src/matchpathcon.c.o selinux/libselinux/src/selinux_config.c.o selinux/libselinux/src/label_backends_android.c.o selinux/libselinux/src/canonicalize_context.c.o selinux/libselinux/src/lsetfilecon.c.o selinux/libselinux/src/policyvers.c.o selinux/libselinux/src/lgetfilecon.c.o selinux/libselinux/src/load_policy.c.o selinux/libselinux/src/seusers.c.o selinux/libselinux/src/sha1.c.o selinux/libselinux/src/booleans.c.o selinux/libselinux/src/disable.c.o selinux/libselinux/src/enabled.c.o selinux/libselinux/src/getenforce.c.o selinux/libselinux/src/setenforce.c.o selinux/libsepol/src/policydb_public.c.o selinux/libsepol/src/genbools.c.o selinux/libsepol/src/debug.c.o selinux/libsepol/src/policydb.c.o selinux/libsepol/src/conditional.c.o selinux/libsepol/src/services.c.o selinux/libsepol/src/ebitmap.c.o selinux/libsepol/src/util.c.o selinux/libsepol/src/assertion.c.o selinux/libsepol/src/avtab.c.o selinux/libsepol/src/hashtab.c.o selinux/libsepol/src/sidtab.c.o selinux/libsepol/src/context.c.o selinux/libsepol/src/genusers.c.o selinux/libsepol/src/context_record.c.o selinux/libsepol/src/mls.c.o selinux/libsepol/src/avrule_block.c.o selinux/libsepol/src/symtab.c.o selinux/libsepol/src/policydb_convert.c.o selinux/libsepol/src/write.c.o selinux/libsepol/src/constraint.c.o selinux/libsepol/src/expand.c.o selinux/libsepol/src/hierarchy.c.o core/fastboot/protocol.cpp.o core/fastboot/engine.cpp.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.cpp.o core/fastboot/fs.cpp.o core/fastboot/usb_linux.cpp.o core/fastboot/socket.cpp.o core/fastboot/tcp.cpp.o core/fastboot/udp.cpp.o core/adb/diagnose_usb.cpp.o
+build fastboot: link 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.cpp.o core/libziparchive/zip_archive.cc.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/logger_read.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/ext4_sb.c.o selinux/libselinux/src/callbacks.c.o selinux/libselinux/src/check_context.c.o selinux/libselinux/src/freecon.c.o selinux/libselinux/src/init.c.o selinux/libselinux/src/label.c.o selinux/libselinux/src/label_file.c.o selinux/libselinux/src/label_support.c.o selinux/libselinux/src/setrans_client.c.o selinux/libselinux/src/regex.c.o selinux/libselinux/src/matchpathcon.c.o selinux/libselinux/src/selinux_config.c.o selinux/libselinux/src/label_backends_android.c.o selinux/libselinux/src/canonicalize_context.c.o selinux/libselinux/src/lsetfilecon.c.o selinux/libselinux/src/policyvers.c.o selinux/libselinux/src/lgetfilecon.c.o selinux/libselinux/src/load_policy.c.o selinux/libselinux/src/seusers.c.o selinux/libselinux/src/sha1.c.o selinux/libselinux/src/booleans.c.o selinux/libselinux/src/disable.c.o selinux/libselinux/src/enabled.c.o selinux/libselinux/src/getenforce.c.o selinux/libselinux/src/setenforce.c.o selinux/libsepol/src/policydb_public.c.o selinux/libsepol/src/genbools.c.o selinux/libsepol/src/debug.c.o selinux/libsepol/src/policydb.c.o selinux/libsepol/src/conditional.c.o selinux/libsepol/src/services.c.o selinux/libsepol/src/ebitmap.c.o selinux/libsepol/src/util.c.o selinux/libsepol/src/assertion.c.o selinux/libsepol/src/avtab.c.o selinux/libsepol/src/hashtab.c.o selinux/libsepol/src/sidtab.c.o selinux/libsepol/src/context.c.o selinux/libsepol/src/genusers.c.o selinux/libsepol/src/context_record.c.o selinux/libsepol/src/mls.c.o selinux/libsepol/src/avrule_block.c.o selinux/libsepol/src/symtab.c.o selinux/libsepol/src/policydb_convert.c.o selinux/libsepol/src/write.c.o selinux/libsepol/src/constraint.c.o selinux/libsepol/src/expand.c.o selinux/libsepol/src/hierarchy.c.o core/fastboot/protocol.cpp.o core/fastboot/engine.cpp.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.cpp.o core/fastboot/fs.cpp.o core/fastboot/usb_linux.cpp.o core/fastboot/socket.cpp.o core/fastboot/tcp.cpp.o core/fastboot/udp.cpp.o core/adb/diagnose_usb.cpp.o
     ldflags = -lz -lpcre2-8 -lpthread -ldl $LDFLAGS
 build e2fsprogs/lib/blkid/cache.c.o: cc e2fsprogs/lib/blkid/cache.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include
@@ -485,7 +487,7 @@
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Ie2fsprogs/lib
 build e2fsprogs/misc/util.c.o: cc e2fsprogs/misc/util.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Ie2fsprogs/lib
-build mke2fs.android: link e2fsprogs/misc/default_profile.c.o e2fsprogs/misc/mke2fs.c.o e2fsprogs/misc/mk_hugefiles.c.o e2fsprogs/misc/util.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/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/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/profile.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/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.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.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/libziparchive/zip_archive.cc.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o
+build mke2fs.android: link e2fsprogs/misc/default_profile.c.o e2fsprogs/misc/mke2fs.c.o e2fsprogs/misc/mk_hugefiles.c.o e2fsprogs/misc/util.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/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/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/profile.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/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.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.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/libziparchive/zip_archive.cc.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/logger_read.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o
     ldflags = -lpthread -lz $LDFLAGS
 build e2fsprogs/contrib/android/e2fsdroid.c.o: cc e2fsprogs/contrib/android/e2fsdroid.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc
@@ -501,9 +503,9 @@
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc
 build e2fsprogs/contrib/android/perms.c.o: cc e2fsprogs/contrib/android/perms.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc
-build e2fsdroid: link e2fsprogs/contrib/android/e2fsdroid.c.o e2fsprogs/contrib/android/basefs_allocator.c.o e2fsprogs/contrib/android/block_range.c.o e2fsprogs/contrib/android/base_fs.c.o e2fsprogs/contrib/android/fsmap.c.o e2fsprogs/contrib/android/block_list.c.o e2fsprogs/contrib/android/perms.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/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/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/profile.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/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.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.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/libziparchive/zip_archive.cc.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o selinux/libselinux/src/callbacks.c.o selinux/libselinux/src/check_context.c.o selinux/libselinux/src/freecon.c.o selinux/libselinux/src/init.c.o selinux/libselinux/src/label.c.o selinux/libselinux/src/label_file.c.o selinux/libselinux/src/label_support.c.o selinux/libselinux/src/setrans_client.c.o selinux/libselinux/src/regex.c.o selinux/libselinux/src/matchpathcon.c.o selinux/libselinux/src/selinux_config.c.o selinux/libselinux/src/label_backends_android.c.o selinux/libselinux/src/canonicalize_context.c.o selinux/libselinux/src/lsetfilecon.c.o selinux/libselinux/src/policyvers.c.o selinux/libselinux/src/lgetfilecon.c.o selinux/libselinux/src/load_policy.c.o selinux/libselinux/src/seusers.c.o selinux/libselinux/src/sha1.c.o selinux/libselinux/src/booleans.c.o selinux/libselinux/src/disable.c.o selinux/libselinux/src/enabled.c.o selinux/libselinux/src/getenforce.c.o selinux/libselinux/src/setenforce.c.o selinux/libsepol/src/policydb_public.c.o selinux/libsepol/src/genbools.c.o selinux/libsepol/src/debug.c.o selinux/libsepol/src/policydb.c.o selinux/libsepol/src/conditional.c.o selinux/libsepol/src/services.c.o selinux/libsepol/src/ebitmap.c.o selinux/libsepol/src/util.c.o selinux/libsepol/src/assertion.c.o selinux/libsepol/src/avtab.c.o selinux/libsepol/src/hashtab.c.o selinux/libsepol/src/sidtab.c.o selinux/libsepol/src/context.c.o selinux/libsepol/src/genusers.c.o selinux/libsepol/src/context_record.c.o selinux/libsepol/src/mls.c.o selinux/libsepol/src/avrule_block.c.o selinux/libsepol/src/symtab.c.o selinux/libsepol/src/policydb_convert.c.o selinux/libsepol/src/write.c.o selinux/libsepol/src/constraint.c.o selinux/libsepol/src/expand.c.o selinux/libsepol/src/hierarchy.c.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.cpp.o
+build e2fsdroid: link e2fsprogs/contrib/android/e2fsdroid.c.o e2fsprogs/contrib/android/basefs_allocator.c.o e2fsprogs/contrib/android/block_range.c.o e2fsprogs/contrib/android/base_fs.c.o e2fsprogs/contrib/android/fsmap.c.o e2fsprogs/contrib/android/block_list.c.o e2fsprogs/contrib/android/perms.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/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/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/profile.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/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.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.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/libziparchive/zip_archive.cc.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/logger_read.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o selinux/libselinux/src/callbacks.c.o selinux/libselinux/src/check_context.c.o selinux/libselinux/src/freecon.c.o selinux/libselinux/src/init.c.o selinux/libselinux/src/label.c.o selinux/libselinux/src/label_file.c.o selinux/libselinux/src/label_support.c.o selinux/libselinux/src/setrans_client.c.o selinux/libselinux/src/regex.c.o selinux/libselinux/src/matchpathcon.c.o selinux/libselinux/src/selinux_config.c.o selinux/libselinux/src/label_backends_android.c.o selinux/libselinux/src/canonicalize_context.c.o selinux/libselinux/src/lsetfilecon.c.o selinux/libselinux/src/policyvers.c.o selinux/libselinux/src/lgetfilecon.c.o selinux/libselinux/src/load_policy.c.o selinux/libselinux/src/seusers.c.o selinux/libselinux/src/sha1.c.o selinux/libselinux/src/booleans.c.o selinux/libselinux/src/disable.c.o selinux/libselinux/src/enabled.c.o selinux/libselinux/src/getenforce.c.o selinux/libselinux/src/setenforce.c.o selinux/libsepol/src/policydb_public.c.o selinux/libsepol/src/genbools.c.o selinux/libsepol/src/debug.c.o selinux/libsepol/src/policydb.c.o selinux/libsepol/src/conditional.c.o selinux/libsepol/src/services.c.o selinux/libsepol/src/ebitmap.c.o selinux/libsepol/src/util.c.o selinux/libsepol/src/assertion.c.o selinux/libsepol/src/avtab.c.o selinux/libsepol/src/hashtab.c.o selinux/libsepol/src/sidtab.c.o selinux/libsepol/src/context.c.o selinux/libsepol/src/genusers.c.o selinux/libsepol/src/context_record.c.o selinux/libsepol/src/mls.c.o selinux/libsepol/src/avrule_block.c.o selinux/libsepol/src/symtab.c.o selinux/libsepol/src/policydb_convert.c.o selinux/libsepol/src/write.c.o selinux/libsepol/src/constraint.c.o selinux/libsepol/src/expand.c.o selinux/libsepol/src/hierarchy.c.o core/libcutils/load_file.cpp.o core/libcutils/socket_local_client_unix.cpp.o core/libcutils/socket_network_client_unix.cpp.o core/libcutils/socket_local_server_unix.cpp.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.cpp.o core/libcutils/sockets.cpp.o core/libcutils/android_get_control_file.cpp.o core/libcutils/threads.cpp.o core/libcutils/fs_config.cpp.o core/libcutils/canned_fs_config.cpp.o
     ldflags = -lz -lpthread -lpcre2-8 $LDFLAGS
 build e2fsprogs/contrib/android/ext2simg.c.o: cc e2fsprogs/contrib/android/ext2simg.c
     cflags = -std=gnu11 $CFLAGS $CPPFLAGS -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/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/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/profile.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/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.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.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/libziparchive/zip_archive.cc.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o
+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/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/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/profile.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/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.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.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/base/test_utils.cpp.o core/libziparchive/zip_archive.cc.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/config_read.c.o core/liblog/logger_lock.c.o core/liblog/local_logger.c.o core/liblog/logger_read.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/liblog/stderr_write.c.o core/liblog/logprint.c.o core/libutils/FileMap.cpp.o
     ldflags = -lz -lpthread $LDFLAGS
--- a/core/liblog/logger.h
+++ b/core/liblog/logger.h
@@ -150,14 +150,14 @@
  * Usage case: search out transport contexts for all readers
  */
 
-LIBLOG_HIDDEN struct listnode __android_log_readers;
+extern LIBLOG_HIDDEN struct listnode __android_log_readers;
 
 #if defined(_WIN32)
 #define logger_list_rdlock()
 #define logger_list_wrlock()
 #define logger_list_unlock()
 #else
-LIBLOG_HIDDEN pthread_rwlock_t __android_log_readers_lock;
+extern LIBLOG_HIDDEN pthread_rwlock_t __android_log_readers_lock;
 
 #define logger_list_rdlock() pthread_rwlock_rdlock(&__android_log_readers_lock)
 #define logger_list_wrlock() pthread_rwlock_wrlock(&__android_log_readers_lock)
@@ -193,7 +193,7 @@
 LIBLOG_HIDDEN int __android_log_trylock();
 LIBLOG_HIDDEN void __android_log_unlock();
 
-LIBLOG_HIDDEN int __android_log_transport;
+extern LIBLOG_HIDDEN int __android_log_transport;
 
 __END_DECLS