futility: updater: Fix build failure
The hack to FTS need to reorder where fts.h is included.
Also add libzip to tests.
BUG=None
TEST=make futil; tests/futility/run_test_scripts.sh $(pwd)/build/futility
BRANCH=None
Change-Id: I63628f519d087220b0c445c16f33c5d0e14030a0
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1588021
diff --git a/Makefile b/Makefile
index 94fe80c..322efd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1141,7 +1141,7 @@
${TEST_FUTIL_BINS}: ${FUTIL_OBJS} ${UTILLIB} ${UTILLIB21}
${TEST_FUTIL_BINS}: INCLUDES += -Ifutility
${TEST_FUTIL_BINS}: OBJS += ${FUTIL_OBJS} ${UTILLIB} ${UTILLIB21}
-${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS}
+${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS}
${TEST2X_BINS}: ${FWLIB2X}
${TEST2X_BINS}: LIBS += ${FWLIB2X}
@@ -1218,8 +1218,8 @@
${BUILD}/host/linktest/main: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/tests/vboot_common2_tests: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/tests/vboot_common3_tests: LDLIBS += ${CRYPTO_LIBS}
-${BUILD}/tests/vb20_common2_tests: LDLIBS += ${CRYPTO_LIBS}
-${BUILD}/tests/vb20_common3_tests: LDLIBS += ${CRYPTO_LIBS}
+${BUILD}/tests/vb20_common2_tests: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS}
+${BUILD}/tests/vb20_common3_tests: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS}
${BUILD}/tests/verify_kernel: LDLIBS += ${CRYPTO_LIBS}
${TEST21_BINS}: LDLIBS += ${CRYPTO_LIBS}
diff --git a/futility/updater_archive.c b/futility/updater_archive.c
index 6d11250..a70cbea 100644
--- a/futility/updater_archive.c
+++ b/futility/updater_archive.c
@@ -8,7 +8,6 @@
#include <assert.h>
#include <ctype.h>
-#include <fts.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
