commit 53c884e28166678b2fa40cb3763d1549074628ad
author Dmitriy Ivanov <dimitry@google.com> Tue Apr 22 17:48:08 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Tue Apr 22 18:44:55 2014 -0700
tree a527d79401bc89a1fbb818869191509f78e88080
parent 635edbdf93a127da7db77d9cd174615734b4fb85

Get ANDROID_DATA dir from enviroment

Change-Id: Ie3675bd27bbc779fc2140f95b930eadd14838753

tests/dlext_test.cpp

diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp
index 14dff2b..872cc5b 100644
--- a/tests/dlext_test.cpp
+++ b/tests/dlext_test.cpp
@@ -40,7 +40,6 @@
 typedef int (*fn)(void);
 #define LIBNAME "libdlext_test.so"
 #define LIBSIZE 1024*1024 // how much address space to reserve for it
-#define RELRO_FILE "/data/local/tmp/libdlext_test.relro"
 
 
 class DlExtTest : public ::testing::Test {
@@ -154,7 +153,11 @@
   extinfo.reserved_size = LIBSIZE;
 
   int relro_fd;
-  relro_fd = open(RELRO_FILE, O_CREAT | O_RDWR | O_TRUNC, 0644);
+  char relro_file[PATH_MAX];
+  const char* android_data = getenv("ANDROID_DATA");
+  ASSERT_TRUE(android_data != NULL);
+  snprintf(relro_file, sizeof(relro_file), "%s/local/tmp/libdlext_test.relro", android_data);
+  relro_fd = open(relro_file, O_CREAT | O_RDWR | O_TRUNC, 0644);
   extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_WRITE_RELRO;
   ASSERT_NOERROR(relro_fd);
   extinfo.relro_fd = relro_fd;
@@ -178,7 +181,7 @@
   ASSERT_TRUE(WIFEXITED(status));
   ASSERT_EQ(0, WEXITSTATUS(status));
 
-  relro_fd = open(RELRO_FILE, O_RDONLY);
+  relro_fd = open(relro_file, O_RDONLY);
   ASSERT_NOERROR(relro_fd);
   extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_USE_RELRO;
   extinfo.relro_fd = relro_fd;