Merge "Change on-device directory for recovery test data"
This commit is contained in:
+1
-1
@@ -43,7 +43,7 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
libcutils \
|
libcutils \
|
||||||
libc
|
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/*)
|
testdata_files := $(call find-subdir-files, testdata/*)
|
||||||
|
|
||||||
GEN := $(addprefix $(testdata_out_path)/, $(testdata_files))
|
GEN := $(addprefix $(testdata_out_path)/, $(testdata_files))
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const char* DATA_PATH = getenv("ANDROID_DATA");
|
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
|
// This is build/target/product/security/testkey.x509.pem after being
|
||||||
// dumped out by dumpkey.jar.
|
// dumped out by dumpkey.jar.
|
||||||
|
|||||||
Reference in New Issue
Block a user