Merge "Update ANGLE namespace creation"

#include <sys/prctl.h>

#include <memory>

#include <mutex>

#include <string>

#include <dlfcn.h>

}

android_namespace_t* GraphicsEnv::getAngleNamespace() {

    static std::once_flag once;

    std::call_once(once, [this]() {

        if (mAnglePath.empty()) return;

    std::lock_guard<std::mutex> lock(mNamespaceMutex);

    if (mAngleNamespace) {

        return mAngleNamespace;

    }

    if (mAnglePath.empty()) {

        ALOGV("mAnglePath is empty, not creating ANGLE namespace");

        return nullptr;

    }

    mAngleNamespace = android_create_namespace("ANGLE",

                                               nullptr,            // ld_library_path

                                                       ANDROID_NAMESPACE_TYPE_ISOLATED,

                                               nullptr, // permitted_when_isolated_path

                                               nullptr);

        if (!mAngleNamespace) ALOGD("Could not create ANGLE namespace from default");

    });

    ALOGD_IF(!mAngleNamespace, "Could not create ANGLE namespace from default");

    return mAngleNamespace;

}

#ifndef ANDROID_UI_GRAPHICS_ENV_H

#define ANDROID_UI_GRAPHICS_ENV_H 1

#include <mutex>

#include <string>

#include <vector>

    std::string mDebugLayers;

    std::string mDebugLayersGLES;

    std::string mLayerPaths;

    std::mutex mNamespaceMutex;

    android_namespace_t* mDriverNamespace = nullptr;

    android_namespace_t* mAngleNamespace = nullptr;

    NativeLoaderNamespace* mAppNamespace = nullptr;