commit 3e51fb8e2a4429267f5558b604a70a175bc4a473
author Dimitry Ivanov <dimitry@google.com> Wed Apr 27 18:41:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 18:41:57 2016 +0000
tree 11a66440221fa6628471577d878e2dd1b4615475
parent cc457efb66f2ba9637e9fc81b4d87d218dc5d298
parent 6cfb476cba812289b0c0a6dd7c2ca367ae81556e

Merge "Enable namespaces for all target sdk versions"
am: 581beeb

* commit '581beebc98e9f420db30e7ff031302fea8ce4af2':
  Enable namespaces for all target sdk versions

Change-Id: I7b0c37717942d0d743e9f877bfba0a29ac0d9c7c

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index f0360db..c7e479a 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -159,10 +159,6 @@
 
 static std::mutex g_namespaces_mutex;
 static LibraryNamespaces* g_namespaces = new LibraryNamespaces;
-
-static bool namespaces_enabled(uint32_t target_sdk_version) {
-  return target_sdk_version > 0;
-}
 #endif
 
 void InitializeNativeLoader() {
@@ -180,10 +176,7 @@
                                    jstring library_path,
                                    jstring permitted_path) {
 #if defined(__ANDROID__)
-  if (!namespaces_enabled(target_sdk_version)) {
-    return nullptr;
-  }
-
+  UNUSED(target_sdk_version);
   std::lock_guard<std::mutex> guard(g_namespaces_mutex);
   android_namespace_t* ns = g_namespaces->Create(env,
                                                  class_loader,
@@ -206,7 +199,8 @@
                         jobject class_loader,
                         jstring library_path) {
 #if defined(__ANDROID__)
-  if (!namespaces_enabled(target_sdk_version) || class_loader == nullptr) {
+  UNUSED(target_sdk_version);
+  if (class_loader == nullptr) {
     return dlopen(path, RTLD_NOW);
   }