Merge pull request #284 from rbessems/loader_fixes

Loader fixes

Author: rpavlik

changes/sdk/pr.284.gh.OpenXR-SDK-Source.md

@@ -0,0 +1,3 @@
+- Loader: Fixed incorrect return value when no broker is present on Android but runtime defined via active_runtime.json.
+- Loader: Added /system to the search path on Android as per documentation.
+- Docs: Fixed typo in docs. 

specification/loader/runtime.adoc

@@ -194,7 +194,7 @@ tag above.
 If no runtime is found this way, as a fall-back, a similar process as on
 Linux takes place, searching for `active_runtime.json` files in:
 
-* `/odm/etc/openxr/1`
+* `/oem/etc/openxr/1`
 * `/vendor/etc/openxr/1`
 * `/system/etc/openxr/1`
 

src/common/platform_utils.hpp

@@ -302,7 +302,7 @@ static inline bool PlatformUtilsSetEnv(const char* /* name */, const char* /* va
 // Intended to be only used as a fallback on Android, with a more open, "native" technique used in most cases
 static inline bool PlatformGetGlobalRuntimeFileName(uint16_t major_version, std::string& file_name) {
     // Prefix for the runtime JSON file name
-    static const char* rt_dir_prefixes[] = {"/oem", "/vendor"};
+    static const char* rt_dir_prefixes[] = {"/oem", "/vendor", "/system"};
     static const std::string rt_filename = "/active_runtime.json";
     static const std::string subdir = "/etc/openxr/";
     for (const auto prefix : rt_dir_prefixes) {

src/loader/manifest_file.cpp

@@ -638,6 +638,7 @@ XrResult RuntimeManifestFile::FindManifestFiles(std::vector<std::unique_ptr<Runt
                 "", "RuntimeManifestFile::FindManifestFiles - failed to determine active runtime file path for this environment");
             return XR_ERROR_RUNTIME_UNAVAILABLE;
         }
+        result = XR_SUCCESS;
         LoaderLogger::LogInfoMessage("", "RuntimeManifestFile::FindManifestFiles - using global runtime file " + filename);
 #endif
     }