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

Commit 34b126b9 authored by Orion Hodson's avatar Orion Hodson
Browse files

Remove dependency on libcutils 

libnativeloader is in the Runtime Module, libcutils is not.

Dependency was on property_get so moving to libbase equivalent.

Bug: b/125323247
Test: m -j100
Change-Id: I295ffa14b475a193a851db89dbb3b4c9cc0183d2
parent 69fc7b62

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() {