Merge "Remove dependency on libcutils" am: 4ac1829d7e am: 2c17cca557

am: ca3916b056

Change-Id: I43ad21d0cd6a88e8288328e2da297d3323312a74
This commit is contained in:
Orion Hodson 2019-02-25 15:38:25 -08:00 committed by android-build-merger
commit b13f84a41c
2 changed files with 5 additions and 5 deletions

View File

@ -21,7 +21,6 @@ cc_library {
shared_libs: [
"libnativehelper",
"liblog",
"libcutils",
"libnativebridge",
"libbase",
],

View File

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