[tests] Fix case 'whole-static-libs' (bug #1157)

Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
crystax · Nov 14, 2015 · f7f0021 · f7f0021
1 parent 4d60244
commit f7f0021
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/tests/device/whole-static-libs/jni/Android.mk b/tests/device/whole-static-libs/jni/Android.mk
@@ -10,7 +10,7 @@ include $(BUILD_STATIC_LIBRARY)
 # create an intermediate one, called 'bar' that includes 'foo' as a whole
 # static library.
 include $(CLEAR_VARS)
-LOCAL_MODULE := bar
+LOCAL_MODULE := bar20E739C8DF824EB4B2216F6F07E6C597
 LOCAL_WHOLE_STATIC_LIBRARIES := foo
 include $(BUILD_SHARED_LIBRARY)
 

diff --git a/tests/device/whole-static-libs/jni/main.c b/tests/device/whole-static-libs/jni/main.c
@@ -10,10 +10,7 @@
 int main(int argc, char *argv[])
 {
     void*  lib;
-    char dir[PATH_MAX];
-    char buf[PATH_MAX];
-    sprintf(buf, "%s/libbar.so", getcwd(dir, sizeof(dir)));
-    lib = dlopen(buf, RTLD_NOW);
+    lib = dlopen("libbar20E739C8DF824EB4B2216F6F07E6C597.so", RTLD_NOW);
     if (lib == NULL) {
         fprintf(stderr, "Could not dlopen(\"libbar.so\"): %s\n", dlerror());
         return 1;