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

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

Merge "Revert "Revert "add unittests for libnativeloader""" am: 879415f6 am: 7e490c14 

am: 63eef147

Change-Id: I56a8df211470f45721b7e896c7f1881668f1f447
parents cbcc01c8 63eef147

libnativeloader/Android.bp

+23 −0
Original line number Diff line number Diff line
@@ -70,3 +70,26 @@ cc_library_headers { 
    host_supported: true,

    export_include_dirs: ["include"],

}



cc_test {

    name: "libnativeloader_test",

    srcs: [

        "native_loader_test.cpp",

        "native_loader.cpp",

        "library_namespaces.cpp",

        "native_loader_namespace.cpp",

        "public_libraries.cpp",

    ],

    cflags: ["-DANDROID"],

    static_libs: [

        "libbase",

        "liblog",

        "libnativehelper",

        "libgmock",

    ],

    header_libs: [

        "libnativebridge-headers",

        "libnativeloader-headers",

    ],

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

}

libnativeloader/library_namespaces.h

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ class LibraryNamespaces { 
  LibraryNamespaces& operator=(const LibraryNamespaces&) = delete;



  void Initialize();

  void Reset() { namespaces_.clear(); }

  void Reset() {

    namespaces_.clear();

    initialized_ = false;

  }

  NativeLoaderNamespace* Create(JNIEnv* env, uint32_t target_sdk_version, jobject class_loader,

                                bool is_shared, jstring dex_path, jstring java_library_path,

                                jstring java_permitted_path, std::string* error_msg);

libnativeloader/native_loader_test.cpp

0 → 100644
+566 −0

File added.

Preview size limit exceeded, changes collapsed.