summaryrefslogtreecommitdiff
path: root/startop
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-15 00:20:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-15 00:20:58 +0000
commitde761b09518531e68c706831cc9c7a0b406d1ff7 (patch)
tree7bd952a873c8b02be232f61fc071e7963abbc38b /startop
parentf812bccfbd99f91dac025efd9dd5dd42c4a43996 (diff)
parentfec19c298fbee3a31093755168f8346fe0813fa1 (diff)
downloadbase-de761b09518531e68c706831cc9c7a0b406d1ff7.tar.gz
Merge "iorap-functional-test: Import test apks from filegroup." into rvc-dev
Diffstat (limited to 'startop')
-rw-r--r--startop/iorap/functional_tests/Android.bp2
l---------startop/iorap/functional_tests/test_data/iorap_test_app_v1.apk1
l---------startop/iorap/functional_tests/test_data/iorap_test_app_v2.apk1
l---------startop/iorap/functional_tests/test_data/iorap_test_app_v3.apk1
4 files changed, 1 insertions, 4 deletions
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