tests: Split unit tests out of component/applypatch_test.cpp.
... into unit/applypatch_test.cpp. And rename the file to
component/applypatch_modes_test.cpp.
Bug: 110106408
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: Ic23c4f054baa2fa0d5e8ea2fcffd22572f1f112e
diff --git a/tests/Android.mk b/tests/Android.mk
index 2576ea0..1fa259e 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,12 +16,34 @@
LOCAL_PATH := $(call my-dir)
+# libapplypatch, libapplypatch_modes, libimgdiff, libimgpatch.
+libapplypatch_static_libraries := \
+ libapplypatch_modes \
+ libapplypatch \
+ libedify \
+ libimgdiff \
+ libimgpatch \
+ libotafault \
+ libotautil \
+ libbsdiff \
+ libbspatch \
+ libdivsufsort \
+ libdivsufsort64 \
+ libutils \
+ libbase \
+ libbrotli \
+ libbz \
+ libcrypto \
+ libz \
+ libziparchive \
+
# Unit tests
include $(CLEAR_VARS)
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE := recovery_unit_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_STATIC_LIBRARIES := \
+ $(libapplypatch_static_libraries) \
libverifier \
librecovery_ui \
libminui \
@@ -37,6 +59,7 @@
libBionicGtestMain
LOCAL_SRC_FILES := \
+ unit/applypatch_test.cpp \
unit/asn1_decoder_test.cpp \
unit/commands_test.cpp \
unit/dirutil_test.cpp \
@@ -77,7 +100,7 @@
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_C_INCLUDES := bootable/recovery
LOCAL_SRC_FILES := \
- component/applypatch_test.cpp \
+ component/applypatch_modes_test.cpp \
component/bootloader_message_test.cpp \
component/edify_test.cpp \
component/imgdiff_test.cpp \
@@ -92,26 +115,6 @@
LOCAL_SHARED_LIBRARIES := \
libhidlbase
-# libapplypatch, libapplypatch_modes, libimgdiff, libimgpatch.
-libapplypatch_static_libraries := \
- libapplypatch_modes \
- libapplypatch \
- libedify \
- libimgdiff \
- libimgpatch \
- libotafault \
- libotautil \
- libbsdiff \
- libbspatch \
- libdivsufsort \
- libdivsufsort64 \
- libutils \
- libbase \
- libbz \
- libcrypto \
- libz \
- libziparchive \
-
tune2fs_static_libraries := \
libext2_com_err \
libext2_blkid \