diff options
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/Android.bp | 2 | ||||
| -rw-r--r-- | libs/ui/GraphicsEnv.cpp | 72 |
2 files changed, 0 insertions, 74 deletions
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index 5edd664345..395a98c004 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -54,7 +54,6 @@ cc_library_shared { "GraphicBuffer.cpp", "GraphicBufferAllocator.cpp", "GraphicBufferMapper.cpp", - "GraphicsEnv.cpp", "HdrCapabilities.cpp", "PixelFormat.cpp", "Rect.cpp", @@ -72,7 +71,6 @@ cc_library_shared { "android.hardware.configstore@1.0", "android.hardware.configstore-utils", "libbase", - "libnativeloader", "libcutils", "libhardware", "libhidlbase", diff --git a/libs/ui/GraphicsEnv.cpp b/libs/ui/GraphicsEnv.cpp deleted file mode 100644 index 8182c07001..0000000000 --- a/libs/ui/GraphicsEnv.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -//#define LOG_NDEBUG 1 -#define LOG_TAG "GraphicsEnv" -#include <ui/GraphicsEnv.h> - -#include <mutex> - -#include <log/log.h> -#include <nativeloader/dlext_namespaces.h> - -// TODO(b/37049319) Get this from a header once one exists -extern "C" { - android_namespace_t* android_get_exported_namespace(const char*); -} - -namespace android { - -/*static*/ GraphicsEnv& GraphicsEnv::getInstance() { - static GraphicsEnv env; - return env; -} - -void GraphicsEnv::setDriverPath(const std::string path) { - if (!mDriverPath.empty()) { - ALOGV("ignoring attempt to change driver path from '%s' to '%s'", - mDriverPath.c_str(), path.c_str()); - return; - } - ALOGV("setting driver path to '%s'", path.c_str()); - mDriverPath = path; -} - -android_namespace_t* GraphicsEnv::getDriverNamespace() { - static std::once_flag once; - std::call_once(once, [this]() { - if (mDriverPath.empty()) - return; - // If the sphal namespace isn't configured for a device, don't support updatable drivers. - // We need a parent namespace to inherit the default search path from. - auto sphalNamespace = android_get_exported_namespace("sphal"); - if (!sphalNamespace) return; - mDriverNamespace = android_create_namespace("gfx driver", - nullptr, // ld_library_path - mDriverPath.c_str(), // default_library_path - ANDROID_NAMESPACE_TYPE_SHARED | - ANDROID_NAMESPACE_TYPE_ISOLATED, - nullptr, // permitted_when_isolated_path - sphalNamespace); - }); - return mDriverNamespace; -} - -} // namespace android - -extern "C" android_namespace_t* android_getDriverNamespace() { - return android::GraphicsEnv::getInstance().getDriverNamespace(); -} |