Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a3d7d2c authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge changes I0940d13e,I38f2d013 am: b42e558b am: 183454f0 am: df096740 

am: 3f804d3e

Change-Id: I4f9473e7b2dc61ddc5cdfa5efba9bc4da14e0831
parents 1e0dfacc 3f804d3e

libnativeloader/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -92,4 +92,5 @@ cc_test { 
        "libnativeloader-headers",

    ],

    system_shared_libs: ["libc", "libm"],

    test_suites: ["device-tests"],

}

libnativeloader/TEST_MAPPING

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "libnativeloader_test"

    }

  ],

  "imports": [

    {

      "path": "cts/tests/tests/jni"

    }

  ]

}

libnativeloader/native_loader_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();