commit a6ac54a215d6b64f5cc5a59b66c1dbfbb41ea9f5
author Dmitriy Ivanov <dimitry@google.com> Tue Sep 09 10:21:42 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Thu Sep 11 22:40:48 2014 -0700
tree 9c449ba5033138dc2fb5b80268bbb01a83e5aa4a
parent 8d8a789c49ffb6b71e4b8f34df937cfaaff86e40

Fix unload of recursively linked library

  Expanded test for recursive libs. Fixed bug with unnecessary
  soinfo_free of already loaded library.

Change-Id: I2cc19f2650c8b12a35feeac127ef608ebba44d88

tests/libs/Android.mk

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index a675a4f..f7c3f9f 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -196,7 +196,7 @@
 #
 # libtest_with_dependency_loop -> a -> b -> c -> a
 # -----------------------------------------------------------------------------
-libtest_with_dependency_loop_src_files := empty.cpp
+libtest_with_dependency_loop_src_files := dlopen_testlib_invalid.cpp
 
 libtest_with_dependency_loop_shared_libraries := \
     libtest_with_dependency_loop_a
@@ -209,7 +209,7 @@
 # -----------------------------------------------------------------------------
 # libtest_with_dependency_loop_a.so
 # -----------------------------------------------------------------------------
-libtest_with_dependency_loop_a_src_files := empty.cpp
+libtest_with_dependency_loop_a_src_files := dlopen_testlib_invalid.cpp
 
 libtest_with_dependency_loop_a_shared_libraries := \
     libtest_with_dependency_loop_b_tmp
@@ -224,7 +224,7 @@
 #
 # this is temporary placeholder - will be removed
 # -----------------------------------------------------------------------------
-libtest_with_dependency_loop_b_tmp_src_files := empty.cpp
+libtest_with_dependency_loop_b_tmp_src_files := dlopen_testlib_invalid.cpp
 libtest_with_dependency_loop_b_tmp_ldflags := -Wl,-soname=libtest_with_dependency_loop_b.so
 
 module := libtest_with_dependency_loop_b_tmp
@@ -235,7 +235,7 @@
 # -----------------------------------------------------------------------------
 # libtest_with_dependency_loop_b.so
 # -----------------------------------------------------------------------------
-libtest_with_dependency_loop_b_src_files := empty.cpp
+libtest_with_dependency_loop_b_src_files := dlopen_testlib_invalid.cpp
 libtest_with_dependency_loop_b_shared_libraries := libtest_with_dependency_loop_c
 
 module := libtest_with_dependency_loop_b
@@ -246,7 +246,7 @@
 # -----------------------------------------------------------------------------
 # libtest_with_dependency_loop_c.so
 # -----------------------------------------------------------------------------
-libtest_with_dependency_loop_c_src_files := empty.cpp
+libtest_with_dependency_loop_c_src_files := dlopen_testlib_invalid.cpp
 
 libtest_with_dependency_loop_c_shared_libraries := \
     libtest_with_dependency_loop_a