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

Commit ca3916b0 authored by Orion Hodson's avatar Orion Hodson Committed by android-build-merger
Browse files

Merge "Remove dependency on libcutils" am: 4ac1829d 

am: 2c17cca5

Change-Id: I4a5c883d59c830d20270a6d6622ac2dd9051226d
parents 79d2d7f1 2c17cca5

libnativeloader/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ cc_library { 
    shared_libs: [

        "libnativehelper",

        "liblog",

        "libcutils",

        "libnativebridge",

        "libbase",

    ],

libnativeloader/native_loader.cpp

+5 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#ifdef __ANDROID__

#define LOG_TAG "libnativeloader"

#include "nativeloader/dlext_namespaces.h"

#include "cutils/properties.h"

#include "log/log.h"

#endif

#include <dirent.h>
@@ -144,9 +143,11 @@ static constexpr const char* kRuntimeApexLibPath = "/apex/com.android.runtime/li 
#endif



static bool is_debuggable() {

  char debuggable[PROP_VALUE_MAX];

  property_get("ro.debuggable", debuggable, "0");

  return std::string(debuggable) == "1";

  bool debuggable = false;

#ifdef __BIONIC__

  debuggable = android::base::GetBoolProperty("ro.debuggable", false);

#endif

  return debuggable;

}



static std::string vndk_version_str() {