Add fallback case to layers_extensions.cpp
Bug: http://b/79940628
Test: cts-tradefed run commandAndExit cts -m CtsGpuToolsHostTestCases
Change-Id: If1485e3f845b781464eca9c6d2a6453baf61a4f5
Merged-In: I2881ff08cce5c129fd4b261814462d71d2c29a89
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 961f101..a8ef7a0 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -56,7 +56,7 @@
mDriverPath = path;
}
-void GraphicsEnv::setLayerPaths(android_namespace_t* appNamespace, const std::string layerPaths) {
+void GraphicsEnv::setLayerPaths(NativeLoaderNamespace* appNamespace, const std::string layerPaths) {
if (mLayerPaths.empty()) {
mLayerPaths = layerPaths;
mAppNamespace = appNamespace;
@@ -66,7 +66,7 @@
}
}
-android_namespace_t* GraphicsEnv::getAppNamespace() {
+NativeLoaderNamespace* GraphicsEnv::getAppNamespace() {
return mAppNamespace;
}
diff --git a/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h b/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h
index 213580c..17e8f6b 100644
--- a/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h
+++ b/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h
@@ -23,6 +23,8 @@
namespace android {
+class NativeLoaderNamespace;
+
class GraphicsEnv {
public:
static GraphicsEnv& getInstance();
@@ -35,8 +37,8 @@
void setDriverPath(const std::string path);
android_namespace_t* getDriverNamespace();
- void setLayerPaths(android_namespace_t* appNamespace, const std::string layerPaths);
- android_namespace_t* getAppNamespace();
+ void setLayerPaths(NativeLoaderNamespace* appNamespace, const std::string layerPaths);
+ NativeLoaderNamespace* getAppNamespace();
const std::string getLayerPaths();
void setDebugLayers(const std::string layers);
@@ -48,7 +50,7 @@
std::string mDebugLayers;
std::string mLayerPaths;
android_namespace_t* mDriverNamespace = nullptr;
- android_namespace_t* mAppNamespace = nullptr;
+ NativeLoaderNamespace* mAppNamespace = nullptr;
};
} // namespace android