From fec19c298fbee3a31093755168f8346fe0813fa1 Mon Sep 17 00:00:00 2001 From: Yan Wang Date: Tue, 7 Apr 2020 11:28:00 -0700 Subject: iorap-functional-test: Import test apks from filegroup. Branch ub-ctsshim-dev doesn't include these apks in other dir and causes dangling symlink. Bug: 153458255 Test: make Change-Id: I9efdfe620d06356d6e6f84faf5334382465c681f --- startop/iorap/functional_tests/Android.bp | 2 +- startop/iorap/functional_tests/test_data/iorap_test_app_v1.apk | 1 - startop/iorap/functional_tests/test_data/iorap_test_app_v2.apk | 1 - startop/iorap/functional_tests/test_data/iorap_test_app_v3.apk | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) delete mode 120000 startop/iorap/functional_tests/test_data/iorap_test_app_v1.apk delete mode 120000 startop/iorap/functional_tests/test_data/iorap_test_app_v2.apk delete mode 120000 startop/iorap/functional_tests/test_data/iorap_test_app_v3.apk (limited to 'startop') diff --git a/startop/iorap/functional_tests/Android.bp b/startop/iorap/functional_tests/Android.bp index ad85f1430bdf..8a5bd34af653 100644 --- a/startop/iorap/functional_tests/Android.bp +++ b/startop/iorap/functional_tests/Android.bp @@ -15,7 +15,7 @@ android_test { name: "iorap-functional-tests", srcs: ["src/**/*.java"], - data: ["test_data/*"], + data: [":iorap-functional-test-apps"], static_libs: [ // Non-test dependencies // library under test diff --git a/startop/iorap/functional_tests/test_data/iorap_test_app_v1.apk b/startop/iorap/functional_tests/test_data/iorap_test_app_v1.apk deleted file mode 120000 index 1c1a437f6a55..000000000000 --- a/startop/iorap/functional_tests/test_data/iorap_test_app_v1.apk +++ /dev/null @@ -1 +0,0 @@ -../../../../../../packages/modules/ArtPrebuilt/iorap/test/iorap_test_app_v1.apk \ No newline at end of file diff --git a/startop/iorap/functional_tests/test_data/iorap_test_app_v2.apk b/startop/iorap/functional_tests/test_data/iorap_test_app_v2.apk deleted file mode 120000 index 7cd41c48ba3a..000000000000 --- a/startop/iorap/functional_tests/test_data/iorap_test_app_v2.apk +++ /dev/null @@ -1 +0,0 @@ -../../../../../../packages/modules/ArtPrebuilt/iorap/test/iorap_test_app_v2.apk \ No newline at end of file diff --git a/startop/iorap/functional_tests/test_data/iorap_test_app_v3.apk b/startop/iorap/functional_tests/test_data/iorap_test_app_v3.apk deleted file mode 120000 index 7f4e996e57d0..000000000000 --- a/startop/iorap/functional_tests/test_data/iorap_test_app_v3.apk +++ /dev/null @@ -1 +0,0 @@ -../../../../../../packages/modules/ArtPrebuilt/iorap/test/iorap_test_app_v3.apk \ No newline at end of file -- cgit v1.2.3