Add test config to libstatspull_test and libstatssocket_test and apply mainline module test controller to it so that the tests will only be run when statsd apex is found on device. Bug: 154845935 Test: m mts && mts-tradefed run mts-statsd Change-Id: I8939e68b4d4c3772e248c1960b74c0f1bd6a21a6
diff --git a/lib/libstatspull/Android.bp b/lib/libstatspull/Android.bp index 2658639..a8b4a4f 100644 --- a/lib/libstatspull/Android.bp +++ b/lib/libstatspull/Android.bp
@@ -85,13 +85,18 @@ "libstatssocket", ], test_suites: ["general-tests", "mts"], + test_config: "libstatspull_test.xml", + //TODO(b/153588990): Remove when the build system properly separates //32bit and 64bit architectures. compile_multilib: "both", multilib: { lib64: { suffix: "64", - } + }, + lib32: { + suffix: "32", + }, }, cflags: [ "-Wall",