commit 4315c6a0c34cb0200def12a05ad5c8c9d4a37d44
author Paul Crowley <paulcrowley@google.com> Tue Dec 06 08:22:04 2016 -0800
committer Paul Crowley <paulcrowley@google.com> Tue Dec 06 08:22:04 2016 -0800
tree a8eb41916b0aed78a7658cb2430982fb1708e872
parent 6218c51e4b4b31814159b7156fb37a93637529c3

Enable building and running the vold_tests module as part of a
standard build; make it use only static libraries as per documented
limitations of APCT.

Bug: 33384925
Test: This is a test.
Change-Id: I794adbfa3376795120cfbca1e9322093960009b5

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index f974e7f..416e621 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -7,11 +7,7 @@
 LOCAL_C_INCLUDES := \
     system/core/fs_mgr/include
 
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libcrypto \
-
-LOCAL_STATIC_LIBRARIES := libvold
+LOCAL_STATIC_LIBRARIES := libselinux libvold liblog libcrypto
 LOCAL_SRC_FILES := VolumeManager_test.cpp
 LOCAL_MODULE := vold_tests
 LOCAL_MODULE_TAGS := eng tests