summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-02-08 20:45:35 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-02-08 20:45:35 +0100
commitbd39fa7bdb0ce4e55cada877084062f32f90edc2 (patch)
treea98d2d7ec23979d85f080efe5b24feaef6d3684c
parentMerge "applypatch: fix memory leaks reported by static analysis." (diff)
parentChange on-device directory for recovery test data (diff)
downloadandroid_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.tar
android_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.tar.gz
android_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.tar.bz2
android_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.tar.lz
android_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.tar.xz
android_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.tar.zst
android_bootable_recovery-bd39fa7bdb0ce4e55cada877084062f32f90edc2.zip
-rw-r--r--tests/Android.mk2
-rw-r--r--tests/component/verifier_test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 3f3c433eb..262fb8bfd 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -43,7 +43,7 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \
libc
-testdata_out_path := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
+testdata_out_path := $(TARGET_OUT_DATA_NATIVE_TESTS)/recovery
testdata_files := $(call find-subdir-files, testdata/*)
GEN := $(addprefix $(testdata_out_path)/, $(testdata_files))
diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp
index 7f7b1b448..c54aa111f 100644
--- a/tests/component/verifier_test.cpp
+++ b/tests/component/verifier_test.cpp
@@ -42,7 +42,7 @@
#endif
static const char* DATA_PATH = getenv("ANDROID_DATA");
-static const char* TESTDATA_PATH = "/recovery_component_test/testdata/";
+static const char* TESTDATA_PATH = "/recovery/testdata/";
// This is build/target/product/security/testkey.x509.pem after being
// dumped out by dumpkey.jar.