commit f81db4e1c09bd7721fc4d7eef99e96e57fbc0788
author Tao Bao <tbao@google.com> Mon Feb 08 20:01:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 08 20:01:34 2016 +0000
tree 58d54d53fcaa54f03d08d6dd08a495e1a4816a01
parent ca78c9f035569b323b537f9300ded8f92bce485f
parent bd39fa7bdb0ce4e55cada877084062f32f90edc2

Merge "Change on-device directory for recovery test data"
am: bd39fa7bdb

* commit 'bd39fa7bdb0ce4e55cada877084062f32f90edc2':
  Change on-device directory for recovery test data

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 3f3c433..262fb8b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -43,7 +43,7 @@
     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))

tests/component/verifier_test.cpp

diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp
index 7f7b1b4..c54aa11 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.