1 files changed, 9 insertions, 5 deletions
diff --git a/thirdparty/openxr/src/loader/manifest_file.hpp b/thirdparty/openxr/src/loader/manifest_file.hpp
index 52fe3134b0..801614ad1e 100644
--- a/thirdparty/openxr/src/loader/manifest_file.hpp
+++ b/thirdparty/openxr/src/loader/manifest_file.hpp
@@ -71,7 +71,8 @@ class ManifestFile {
 class RuntimeManifestFile : public ManifestFile {
    public:
     // Factory method
-    static XrResult FindManifestFiles(std::vector<std::unique_ptr<RuntimeManifestFile>> &manifest_files);
+    static XrResult FindManifestFiles(const std::string &openxr_command,
+                                      std::vector<std::unique_ptr<RuntimeManifestFile>> &manifest_files);
 
    private:
     RuntimeManifestFile(const std::string &filename, const std::string &library_path);
@@ -87,7 +88,8 @@ using LibraryLocator = bool (*)(const std::string &json_filename, const std::str
 class ApiLayerManifestFile : public ManifestFile {
    public:
     // Factory method
-    static XrResult FindManifestFiles(ManifestFileType type, std::vector<std::unique_ptr<ApiLayerManifestFile>> &manifest_files);
+    static XrResult FindManifestFiles(const std::string &openxr_command, ManifestFileType type,
+                                      std::vector<std::unique_ptr<ApiLayerManifestFile>> &manifest_files);
 
     const std::string &LayerName() const { return _layer_name; }
     void PopulateApiLayerProperties(XrApiLayerProperties &props) const;
@@ -104,11 +106,13 @@ class ApiLayerManifestFile : public ManifestFile {
     /// @return false if we could not find the library.
     static bool LocateLibraryRelativeToJson(const std::string &json_filename, const std::string &library_path,
                                             std::string &out_combined_path);
-#ifdef XR_USE_PLATFORM_ANDROID
+
+#if defined(XR_KHR_LOADER_INIT_SUPPORT) && defined(XR_USE_PLATFORM_ANDROID)
     static bool LocateLibraryInAssets(const std::string &json_filename, const std::string &library_path,
                                       std::string &out_combined_path);
-    static void AddManifestFilesAndroid(ManifestFileType type, std::vector<std::unique_ptr<ApiLayerManifestFile>> &manifest_files);
-#endif
+    static void AddManifestFilesAndroid(const std::string &openxr_command, ManifestFileType type,
+                                        std::vector<std::unique_ptr<ApiLayerManifestFile>> &manifest_files);
+#endif  // defined(XR_USE_PLATFORM_ANDROID) && defined(XR_KHR_LOADER_INIT_SUPPORT)
 
     JsonVersion _api_version;
     std::string _layer_name;