Remove $(module)_install_to_out_data flag from test makefile
Use non-empty $(module)_install_to_out_data_dir as indication
of custom target dir for a library.
Bug: http://b/22182538
Test: build and run bionic-unit-tests --gtest_filter=dl*:Dl*
Change-Id: Ibfc87f45084a6fe2f487ca1b17a7625a8d8ec707
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index aa70b86..3c3d78b 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -70,13 +70,14 @@
# -----------------------------------------------------------------------------
# Library used by dlext tests - different name non-default location
# -----------------------------------------------------------------------------
+module := libdlext_test_fd
+
libdlext_test_fd_src_files := \
dlext_test_library.cpp \
libdlext_test_fd_shared_libraries := libtest_simple
-libdlext_test_fd_install_to_out_data := true
-module := libdlext_test_fd
+libdlext_test_fd_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY
@@ -86,23 +87,25 @@
# -----------------------------------------------------------------------------
# Libraries used by dlext tests for open from a zip-file
# -----------------------------------------------------------------------------
+module := libdlext_test_zip
+
libdlext_test_zip_src_files := \
dlext_test_library.cpp \
libdlext_test_zip_shared_libraries := libatest_simple_zip
-libdlext_test_zip_install_to_out_data := true
-module := libdlext_test_zip
+libdlext_test_zip_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY
include $(TEST_PATH)/Android.build.mk
+module := libatest_simple_zip
+
libatest_simple_zip_src_files := \
dlopen_testlib_simple.cpp
-libatest_simple_zip_install_to_out_data := true
-module := libatest_simple_zip
+libatest_simple_zip_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY