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/res-testdata/res-hdpi | 1 - tests/res-testdata/res-mdpi | 1 - tests/res-testdata/res-xhdpi | 1 - tests/res-testdata/res-xxhdpi | 1 - tests/res-testdata/res-xxxhdpi | 1 - 5 files changed, 5 deletions(-) delete mode 120000 tests/res-testdata/res-hdpi delete mode 120000 tests/res-testdata/res-mdpi delete mode 120000 tests/res-testdata/res-xhdpi delete mode 120000 tests/res-testdata/res-xxhdpi delete mode 120000 tests/res-testdata/res-xxxhdpi (limited to 'tests/res-testdata') diff --git a/tests/res-testdata/res-hdpi b/tests/res-testdata/res-hdpi deleted file mode 120000 index c339b1df4..000000000 --- a/tests/res-testdata/res-hdpi +++ /dev/null @@ -1 +0,0 @@ -../../res-hdpi \ No newline at end of file diff --git a/tests/res-testdata/res-mdpi b/tests/res-testdata/res-mdpi deleted file mode 120000 index 4be630d6f..000000000 --- a/tests/res-testdata/res-mdpi +++ /dev/null @@ -1 +0,0 @@ -../../res-mdpi \ No newline at end of file diff --git a/tests/res-testdata/res-xhdpi b/tests/res-testdata/res-xhdpi deleted file mode 120000 index 429eead83..000000000 --- a/tests/res-testdata/res-xhdpi +++ /dev/null @@ -1 +0,0 @@ -../../res-xhdpi \ No newline at end of file diff --git a/tests/res-testdata/res-xxhdpi b/tests/res-testdata/res-xxhdpi deleted file mode 120000 index 304cc28b3..000000000 --- a/tests/res-testdata/res-xxhdpi +++ /dev/null @@ -1 +0,0 @@ -../../res-xxhdpi \ No newline at end of file diff --git a/tests/res-testdata/res-xxxhdpi b/tests/res-testdata/res-xxxhdpi deleted file mode 120000 index 2236ad8cc..000000000 --- a/tests/res-testdata/res-xxxhdpi +++ /dev/null @@ -1 +0,0 @@ -../../res-xxxhdpi \ No newline at end of file -- cgit v1.2.3