Merge changes I0940d13e,I38f2d013

am: b42e558b5a

Change-Id: I86eac53776180c14a72389dee88238c2bd489269
This commit is contained in:
Jiyong Park 2019-07-23 09:22:22 -07:00 committed by android-build-merger
commit 183454f0c7
3 changed files with 14 additions and 1 deletions

View file

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

View file

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

View file

@ -336,7 +336,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest {
std::string expected_parent_namespace = "platform";
bool expected_link_with_platform_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_default_ns = false;
std::string expected_shared_libs_to_platform_ns = default_public_libraries();