diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 334364e67..65af2b3d6 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -250,9 +250,8 @@ cc_test { require_root: true, } -cc_test { - name: "libcutils_test_static", - test_suites: ["device-tests"], +cc_defaults { + name: "libcutils_test_static_defaults", defaults: ["libcutils_test_default"], static_libs: [ "libc", @@ -272,3 +271,16 @@ cc_test { }, }, } + +cc_test { + name: "libcutils_test_static", + test_suites: ["device-tests"], + defaults: ["libcutils_test_static_defaults"], +} + +cc_test { + name: "KernelLibcutilsTest", + test_suites: ["general-tests", "vts-core"], + defaults: ["libcutils_test_static_defaults"], + test_config: "KernelLibcutilsTest.xml", +} diff --git a/libcutils/KernelLibcutilsTest.xml b/libcutils/KernelLibcutilsTest.xml new file mode 100644 index 000000000..e27fac681 --- /dev/null +++ b/libcutils/KernelLibcutilsTest.xml @@ -0,0 +1,33 @@ + + + +