From ef5e38fef0b80b36101ac66a79bbcff0f22e6605 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 24 Jul 2018 15:34:39 -0700 Subject: tests: Move to Android.bp. Also separate libupdater_defaults out to be shareable. It turns out the `data` property in `cc_test` doesn't follow symlinks as LOCAL_TEST_DATA does in Android.mk. This CL creates a filegroup in top-level Android.bp in order to pick up the testdata for ResourcesTest. Test: `mmma -j bootable/recovery` with aosp_marlin-userdebug Test: Run recovery_{unit,component,manual}_test on marlin. Test: Run recovery_host_test. Change-Id: I4532ab25aeb83c0b0baa8051d5fe34ba7b910a35 --- tests/component/resources_test.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/component') diff --git a/tests/component/resources_test.cpp b/tests/component/resources_test.cpp index b00c3d528..54329db22 100644 --- a/tests/component/resources_test.cpp +++ b/tests/component/resources_test.cpp @@ -33,9 +33,8 @@ static const std::string kLocale = "zu"; static const std::vector kResourceImagesDirs{ - "res-testdata/res-mdpi/images/", "res-testdata/res-hdpi/images/", - "res-testdata/res-xhdpi/images/", "res-testdata/res-xxhdpi/images/", - "res-testdata/res-xxxhdpi/images/", + "res-mdpi/images/", "res-hdpi/images/", "res-xhdpi/images/", + "res-xxhdpi/images/", "res-xxxhdpi/images/", }; static int png_filter(const dirent* de) { -- cgit v1.2.3