diff options
Diffstat (limited to 'native/Android.bp')
| -rw-r--r-- | native/Android.bp | 55 |
1 files changed, 53 insertions, 2 deletions
diff --git a/native/Android.bp b/native/Android.bp index 5287894..4f14b4f 100644 --- a/native/Android.bp +++ b/native/Android.bp @@ -31,6 +31,7 @@ cc_library_headers { "com.android.btservices", "com.android.neuralnetworks", "test_com.android.neuralnetworks", + "com.android.ondevicepersonalization", ], min_sdk_version: "apex_inherit", sdk_version: "current", @@ -71,6 +72,7 @@ cc_library_static { "test_com.android.neuralnetworks", "com.android.extservices", "com.android.adservices", + "com.android.ondevicepersonalization", ], } @@ -251,7 +253,7 @@ cc_library { // libtextclassifier_tests // ----------------------- cc_test { - name: "libtextclassifier_tests", + name: "libtextclassifier_tests-tplus", defaults: ["libtextclassifier_defaults"], test_suites: ["general-tests", "mts-extservices"], @@ -277,10 +279,59 @@ cc_test { "libtextclassifier_fbgen_utils_lua_utils_tests", ], - compile_multilib: "prefer32", + compile_multilib: "both", + multilib: { + lib32: { + suffix: "32", + }, + lib64: { + suffix: "64", + }, + }, + // A workaround for code coverage. See b/166040889#comment23 + sdk_variant_only: true, + test_config: "AndroidTest-tplus.xml", +} + +cc_test { + name: "libtextclassifier_tests-sminus", + defaults: ["libtextclassifier_defaults"], + test_suites: ["general-tests", "mts-extservices"], + + data: [ + "**/test_data/*", + "**/*.bfbs", + ], + + srcs: ["**/*.cc"], + exclude_srcs: [":libtextclassifier_java_test_sources"], + + header_libs: ["jni_headers"], + + static_libs: [ + "libgmock_ndk", + "libgtest_ndk_c++", + "libbase_ndk", + ], + + generated_headers: [ + "libtextclassifier_fbgen_utils_flatbuffers_flatbuffers_test", + "libtextclassifier_fbgen_utils_lua_utils_tests", + ], + + compile_multilib: "both", + multilib: { + lib32: { + suffix: "32", + }, + lib64: { + suffix: "64", + }, + }, // A workaround for code coverage. See b/166040889#comment23 sdk_variant_only: true, + test_config: "AndroidTest-sminus.xml", } // ------------------------------------ |