diff options
| author | Tao Bao <tbao@google.com> | 2016-02-08 21:01:34 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-08 21:01:34 +0100 |
| commit | f81db4e1c09bd7721fc4d7eef99e96e57fbc0788 (patch) | |
| tree | 58d54d53fcaa54f03d08d6dd08a495e1a4816a01 | |
| parent | resolve merge conflicts of 715d8a203a to master. (diff) | |
| parent | Merge "Change on-device directory for recovery test data" (diff) | |
| download | android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.tar android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.tar.gz android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.tar.bz2 android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.tar.lz android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.tar.xz android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.tar.zst android_bootable_recovery-f81db4e1c09bd7721fc4d7eef99e96e57fbc0788.zip | |
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/component/verifier_test.cpp | 2 |
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. |