diff options
| author | Steve Muckle <smuckle@google.com> | 2019-06-14 11:35:53 -0700 |
|---|---|---|
| committer | Steve Muckle <smuckle@google.com> | 2019-06-14 16:10:25 -0700 |
| commit | 9b90198887462249a293f242560e00993206a4e8 (patch) | |
| tree | b2487f0d71a27c6743e50508bf80eb47d9209674 | |
| parent | 4e5fddd5f5628420e9f6b65a6d2a692e4ea03cd3 (diff) | |
| download | core-9b90198887462249a293f242560e00993206a4e8.tar.gz | |
VtsKernelLiblpTest: use static test
To avoid introducing dependencies on target libraries, use a statically
compiled test instead.
Bug: 134912860
Test: run vts-kernel -m VtsKernelLiblpTest
Change-Id: Ie24cc8532c7821cb225c024c240c4d485557bfa7
| -rw-r--r-- | fs_mgr/liblp/Android.bp | 38 | ||||
| -rw-r--r-- | fs_mgr/liblp/AndroidTest.xml | 4 |
2 files changed, 24 insertions, 18 deletions
diff --git a/fs_mgr/liblp/Android.bp b/fs_mgr/liblp/Android.bp index 70399942e..b5041613a 100644 --- a/fs_mgr/liblp/Android.bp +++ b/fs_mgr/liblp/Android.bp @@ -14,6 +14,16 @@ // limitations under the License. // +liblp_lib_deps = [ + "libbase", + "liblog", + "libcrypto", + "libcrypto_utils", + "libsparse", + "libext4_utils", + "libz", +] + cc_library { name: "liblp", host_supported: true, @@ -30,15 +40,7 @@ cc_library { "utility.cpp", "writer.cpp", ], - shared_libs: [ - "libbase", - "liblog", - "libcrypto", - "libcrypto_utils", - "libsparse", - "libext4_utils", - "libz", - ], + shared_libs: liblp_lib_deps, target: { windows: { enabled: true, @@ -53,24 +55,28 @@ cc_library { } cc_test { - name: "liblp_test", + name: "liblp_test_static", defaults: ["fs_mgr_defaults"], cppflags: [ "-Wno-unused-parameter", ], static_libs: [ "libgmock", - ], - shared_libs: [ - "liblp", - "libbase", "libfs_mgr", - "libsparse", - ], + "liblp", + ] + liblp_lib_deps, + stl: "libc++_static", srcs: [ "builder_test.cpp", "io_test.cpp", "test_partition_opener.cpp", "utility_test.cpp", ], + target: { + android: { + static_libs: [ + "libcutils", + ], + }, + }, } diff --git a/fs_mgr/liblp/AndroidTest.xml b/fs_mgr/liblp/AndroidTest.xml index 007a302e0..fe1002c4e 100644 --- a/fs_mgr/liblp/AndroidTest.xml +++ b/fs_mgr/liblp/AndroidTest.xml @@ -21,8 +21,8 @@ </target_preparer> <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="VtsKernelLiblpTest"/> - <option name="binary-test-source" value="_32bit::DATA/nativetest/liblp_test/liblp_test" /> - <option name="binary-test-source" value="_64bit::DATA/nativetest64/liblp_test/liblp_test" /> + <option name="binary-test-source" value="_32bit::DATA/nativetest/liblp_test_static/liblp_test_static" /> + <option name="binary-test-source" value="_64bit::DATA/nativetest64/liblp_test_static/liblp_test_static" /> <option name="binary-test-type" value="gtest"/> <option name="test-timeout" value="1m"/> <option name="precondition-first-api-level" value="29" /> |