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

Commit 78021ecf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libgraphicsenv: get linker symbols from real header"

parents ade0c8aa 49b9ac79

libs/graphicsenv/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -32,5 +32,9 @@ cc_library_shared { 
        "libutils",

    ],



    header_libs: [

        "libnativeloader-dummy-headers",

    ],



    export_include_dirs: ["include"],

}

libs/graphicsenv/GraphicsEnv.cpp

+1 −16
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <cutils/properties.h>

#include <graphicsenv/IGpuService.h>

#include <log/log.h>

#include <nativeloader/dlext_namespaces.h>

#include <sys/prctl.h>

#include <utils/Trace.h>
@@ -39,22 +40,6 @@ 
#include <string>

#include <thread>



// TODO(b/37049319) Get this from a header once one exists

extern "C" {

android_namespace_t* android_get_exported_namespace(const char*);

android_namespace_t* android_create_namespace(const char* name, const char* ld_library_path,

                                              const char* default_library_path, uint64_t type,

                                              const char* permitted_when_isolated_path,

                                              android_namespace_t* parent);

bool android_link_namespaces(android_namespace_t* from, android_namespace_t* to,

                             const char* shared_libs_sonames);



enum {

    ANDROID_NAMESPACE_TYPE_ISOLATED = 1,

    ANDROID_NAMESPACE_TYPE_SHARED = 2,

};

}



// TODO(ianelliott@): Get the following from an ANGLE header:

#define CURRENT_ANGLE_API_VERSION 2 // Current API verion we are targetting

// Version-2 API: