tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch libvndksupport's linker.c to C++

Browse source 
Bug: none
Test: device boots
Change-Id: I64237006a7f903647c8d8f7ca681b1da23ac53a9
This commit is contained in:
Ryan Prichard 2019-07-15 13:35:31 -07:00
parent 8a779ee959
commit 807d9d62d8
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libvndksupport/Android.bp
View file

@ -3,7 +3,7 @@ subdirs = ["tests"]
cc_library {
name: "libvndksupport",
native_bridge_supported: true,
srcs: ["linker.c"],
srcs: ["linker.cpp"],
cflags: [
"-Wall",
"-Werror",

9
libvndksupport/linker.c → libvndksupport/linker.cpp
View file

@ -23,8 +23,10 @@
#include <sys/types.h>
#include <unistd.h>
__attribute__((weak)) extern struct android_namespace_t* android_get_exported_namespace(const char*);
__attribute__((weak)) extern void* android_dlopen_ext(const char*, int, const android_dlextinfo*);
__attribute__((weak)) extern "C" struct android_namespace_t* android_get_exported_namespace(
const char*);
__attribute__((weak)) extern "C" void* android_dlopen_ext(const char*, int,
const android_dlextinfo*);
static const char* namespace_name = NULL;
@ -67,7 +69,8 @@ void* android_load_sphal_library(const char* name, int flag) {
struct android_namespace_t* vendor_namespace = get_vendor_namespace();
if (vendor_namespace != NULL) {
const android_dlextinfo dlextinfo = {
.flags = ANDROID_DLEXT_USE_NAMESPACE, .library_namespace = vendor_namespace,
.flags = ANDROID_DLEXT_USE_NAMESPACE,
.library_namespace = vendor_namespace,
};
void* handle = NULL;
if (android_dlopen_ext != NULL) {