ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I0940d13e,I38f2d013

Browse source 
* changes:
  Add TEST_MAPPING for libnativeloader
  Test the link to the sphal namespace when only needed
This commit is contained in:
Treehugger Robot 2019-07-23 15:57:37 +00:00 • committed by Gerrit Code Review
commit b42e558b5a
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnativeloader/Android.bp
View file

@ -92,4 +92,5 @@ cc_test {
"libnativeloader-headers", "libnativeloader-headers",
], ],
system_shared_libs: ["libc", "libm"], system_shared_libs: ["libc", "libm"],
test_suites: ["device-tests"],
} }

12
libnativeloader/TEST_MAPPING Normal file
View file

@ -0,0 +1,12 @@
{
"presubmit": [
{
"name": "libnativeloader_test"
}
],
"imports": [
{
"path": "cts/tests/tests/jni"
}
]
}

2
libnativeloader/native_loader_test.cpp
View file

@ -336,7 +336,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest {
std::string expected_parent_namespace = "platform"; std::string expected_parent_namespace = "platform";
bool expected_link_with_platform_ns = true; bool expected_link_with_platform_ns = true;
bool expected_link_with_runtime_ns = true; bool expected_link_with_runtime_ns = true;
bool expected_link_with_sphal_ns = true; bool expected_link_with_sphal_ns = !vendor_public_libraries().empty();
bool expected_link_with_vndk_ns = false; bool expected_link_with_vndk_ns = false;
bool expected_link_with_default_ns = false; bool expected_link_with_default_ns = false;
std::string expected_shared_libs_to_platform_ns = default_public_libraries(); std::string expected_shared_libs_to_platform_ns = default_public_libraries();