Fix all API layers being loaded as explicit on Android

pembem22 · rpavlik · commit 2e2c7d530bf6 · 2024-05-10T17:37:16.000-05:00
diff --git a/changes/sdk/pr.475.gh.OpenXR-SDK-Source.md b/changes/sdk/pr.475.gh.OpenXR-SDK-Source.md
@@ -0,0 +1 @@
+Fix: Do not load all Android app-supplied layers as explicit, but rather as their actual type.
diff --git a/src/loader/manifest_file.cpp b/src/loader/manifest_file.cpp
@@ -773,8 +773,7 @@ void ApiLayerManifestFile::AddManifestFilesAndroid(const std::string &openxr_com
         }
         std::istringstream json_stream(std::string{buf, length});
 
-        CreateIfValid(ManifestFileType::MANIFEST_TYPE_EXPLICIT_API_LAYER, filename, json_stream,
-                      &ApiLayerManifestFile::LocateLibraryInAssets, manifest_files);
+        CreateIfValid(type, filename, json_stream, &ApiLayerManifestFile::LocateLibraryInAssets, manifest_files);
     }
 }
 #endif  // defined(XR_USE_PLATFORM_ANDROID) && defined(XR_KHR_LOADER_INIT_SUPPORT)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix: Do not load all Android app-supplied layers as explicit, but rather as their actual type.`
Original file line number	Diff line number	Diff line change
`@@ -773,8 +773,7 @@ void ApiLayerManifestFile::AddManifestFilesAndroid(const std::string &openxr_com`
`773`	`773`	`}`
`774`	`774`	`std::istringstream json_stream(std::string{buf, length});`
`775`	`775`
`776`		`- CreateIfValid(ManifestFileType::MANIFEST_TYPE_EXPLICIT_API_LAYER, filename, json_stream,`
`777`		`- &ApiLayerManifestFile::LocateLibraryInAssets, manifest_files);`
	`776`	`+ CreateIfValid(type, filename, json_stream, &ApiLayerManifestFile::LocateLibraryInAssets, manifest_files);`
`778`	`777`	`}`
`779`	`778`	`}`
`780`	`779`	`#endif // defined(XR_USE_PLATFORM_ANDROID) && defined(XR_KHR_LOADER_INIT_SUPPORT)`