commit ee2952e84ff991ff7adcf55fb604fa100a379ef7
author Kevin Brodsky <kevin.brodsky@linaro.org> Fri Dec 09 09:54:42 2016 +0000
committer Kevin Brodsky <kevin.brodsky@linaro.org> Fri Dec 09 17:26:11 2016 +0000
tree 0f06a604a5182c54d079965aa9e86f4f48dd21e4
parent 227894a754eb11cb1203c359192d59654b01b93e

bionic-unit-tests: Build host testlibs in bionic-loader-test-libs

The target test libs are now all built in
nativetest/bionic-loader-test-libs. However, libs built using
libs/Android.build.testlib.mk are still put in lib/ on the host.

This commit refactors libs/Android.build.testlib*.mk so that all test
libs go into nativetest/bionic-loader-test-libs on the host; nothing
changes on the target. Android.build.mk now understands
*_install_to_native_tests_dir both for host and target builds.

Change-Id: I1022e9bab38bf53036c95fd39b3b240bcb31f23a

tests/libs/Android.build.testlib.mk

diff --git a/tests/libs/Android.build.testlib.mk b/tests/libs/Android.build.testlib.mk
index 833caf6..a46c457 100644
--- a/tests/libs/Android.build.testlib.mk
+++ b/tests/libs/Android.build.testlib.mk
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 
-build_target := SHARED_LIBRARY
-build_type := host
-include $(TEST_PATH)/Android.build.mk
+include $(LOCAL_PATH)/Android.build.testlib.host.mk
 
 include $(LOCAL_PATH)/Android.build.testlib.target.mk
-