commit a5c6cf93d2b5666a2c7913b28e8e4fcbf989f0ee
author Ryan Prichard <rprichard@google.com> Mon Jul 15 13:35:31 2019 -0700
committer Ryan Prichard <rprichard@google.com> Mon Jul 15 13:43:05 2019 -0700
tree 00b8ae31d49eff84bfd9b23b81f128fe6c7f7ce7
parent 1d6c47e0a404dabe72030311edcf68d324e62a0c

Switch libvndksupport's linker.c to C++

Bug: none
Test: device boots
Change-Id: I64237006a7f903647c8d8f7ca681b1da23ac53a9

libvndksupport/Android.bp

diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp
index e5b536c..f4544a1 100644
--- a/libvndksupport/Android.bp
+++ b/libvndksupport/Android.bp
@@ -3,7 +3,7 @@
 cc_library {
     name: "libvndksupport",
     native_bridge_supported: true,
-    srcs: ["linker.c"],
+    srcs: ["linker.cpp"],
     cflags: [
         "-Wall",
         "-Werror",

libvndksupport/linker.cpp

diff --git a/libvndksupport/linker.c b/libvndksupport/linker.cpp
similarity index 87%
rename from libvndksupport/linker.c
rename to libvndksupport/linker.cpp
index 84c2132..057e5b1 100644
--- a/libvndksupport/linker.c
+++ b/libvndksupport/linker.cpp
@@ -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 @@
     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) {