Update libnativeloader dependency on libnativehelper
Only requires header library dependency.
Test: m
Change-Id: I84de37651f4cb01bdaaa2b354f0a71058a5772f8
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index be902c0..f6dab2d 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -26,8 +26,8 @@
srcs: [
"native_loader.cpp",
],
+ header_libs: ["libnativehelper_header_only"],
shared_libs: [
- "libnativehelper",
"liblog",
"libnativebridge",
"libbase",
@@ -97,12 +97,12 @@
static_libs: [
"libbase",
"liblog",
- "libnativehelper",
"libgmock",
"PlatformProperties",
],
header_libs: [
"libnativebridge-headers",
+ "libnativehelper_header_only",
"libnativeloader-headers",
],
// native_loader_test.cpp mocks libdl APIs so system_shared_libs
diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index b727651..3be379a 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -27,7 +27,7 @@
#include <android-base/macros.h>
#include <android-base/properties.h>
#include <android-base/strings.h>
-#include <nativehelper/ScopedUtfChars.h>
+#include <nativehelper/scoped_utf_chars.h>
#include "nativeloader/dlext_namespaces.h"
#include "public_libraries.h"
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 6d3c057..efcb769 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -30,7 +30,7 @@
#include <android-base/macros.h>
#include <android-base/strings.h>
#include <nativebridge/native_bridge.h>
-#include <nativehelper/ScopedUtfChars.h>
+#include <nativehelper/scoped_utf_chars.h>
#ifdef __ANDROID__
#include <log/log.h>
