diff --git a/libstats/pull/Android.bp b/libstats/pull/Android.bp index 2658639c0..a8b4a4faf 100644 --- a/libstats/pull/Android.bp +++ b/libstats/pull/Android.bp @@ -85,13 +85,18 @@ cc_test { "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", diff --git a/libstats/pull/libstatspull_test.xml b/libstats/pull/libstatspull_test.xml new file mode 100644 index 000000000..233fc1f18 --- /dev/null +++ b/libstats/pull/libstatspull_test.xml @@ -0,0 +1,37 @@ + + + + diff --git a/libstats/socket/Android.bp b/libstats/socket/Android.bp index 4e89b9420..2bf0261b2 100644 --- a/libstats/socket/Android.bp +++ b/libstats/socket/Android.bp @@ -127,13 +127,17 @@ cc_test { "libutils", ], test_suites: ["device-tests", "mts"], + test_config: "libstatssocket_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", + }, }, require_root: true, } diff --git a/libstats/socket/libstatssocket_test.xml b/libstats/socket/libstatssocket_test.xml new file mode 100644 index 000000000..d2694d1dd --- /dev/null +++ b/libstats/socket/libstatssocket_test.xml @@ -0,0 +1,38 @@ + + + + +