From 26b645447f889d7c923c2e56888b6b656d4cdec3 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 15 Aug 2018 15:18:48 -0700
Subject: tests: Add the missing tests in applypatch_modes_test.cpp.

This file was somehow missed when converting from Android.mk to
Android.bp. This CL addresses the issue by picking up all the .cpp files
in the test source dir.

Test: Run recovery_{unit,component}_test on marlin. Check the reported
      number of tests (94 for unit test and 157 for component test).
Change-Id: I50435b07fcb8602ef7b3f7e7d3a69e10b6a5932d
---
 tests/Android.bp | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'tests/Android.bp')

diff --git a/tests/Android.bp b/tests/Android.bp
index d305e2560..4764bc415 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -108,15 +108,7 @@ cc_test {
     test_suites: ["device-tests"],
 
     srcs: [
-        "unit/asn1_decoder_test.cpp",
-        "unit/applypatch_test.cpp",
-        "unit/commands_test.cpp",
-        "unit/dirutil_test.cpp",
-        "unit/locale_test.cpp",
-        "unit/rangeset_test.cpp",
-        "unit/screen_ui_test.cpp",
-        "unit/sysutil_test.cpp",
-        "unit/zip_test.cpp",
+        "unit/*.cpp",
     ],
 
     static_libs: libapplypatch_static_libs + [
@@ -161,16 +153,7 @@ cc_test {
     test_suites: ["device-tests"],
 
     srcs: [
-        "component/bootloader_message_test.cpp",
-        "component/edify_test.cpp",
-        "component/imgdiff_test.cpp",
-        "component/install_test.cpp",
-        "component/resources_test.cpp",
-        "component/sideload_test.cpp",
-        "component/uncrypt_test.cpp",
-        "component/updater_test.cpp",
-        "component/update_verifier_test.cpp",
-        "component/verifier_test.cpp",
+        "component/*.cpp",
     ],
 
     static_libs: libapplypatch_static_libs + librecovery_static_libs + [
-- 
cgit v1.2.3


From 435dfac15caf0e89c366d12d779c813c4b763042 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Wed, 15 Aug 2018 16:11:25 -0700
Subject: Fixing the Mac SDK build

recovery_host_test is now excluded from darwin targets as its
dependency libimgdiff is.

Change-Id: I6aa085125109ed2218572df97f35289b71c354ab
---
 tests/Android.bp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests/Android.bp')

diff --git a/tests/Android.bp b/tests/Android.bp
index d305e2560..a880b76d8 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -215,4 +215,11 @@ cc_test_host {
     ],
 
     data: ["testdata/*"],
+
+    target: {
+        darwin: {
+            // libimgdiff is not available on the Mac.
+            enabled: false,
+        },
+    },
 }
-- 
cgit v1.2.3