Merge pull request #274 from rpavlik/android-include-guard

Android file ifdef guard in loader

Author: rpavlik

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

@@ -0,0 +1 @@
+- Loader: Add `ifdef` guards around contents of Android-specific files so all platforms may still glob all source files in OpenXR-SDK to build the loader with a custom build system.

src/loader/CMakeLists.txt

@@ -46,6 +46,8 @@ else() # build static lib
 endif()
 
 add_library(openxr_loader ${LIBRARY_TYPE}
+    android_utilities.cpp
+    android_utilities.h
     api_layer_interface.cpp
     api_layer_interface.hpp
     loader_core.cpp
@@ -231,8 +233,6 @@ elseif(ANDROID)
         CXX_STANDARD_REQUIRED TRUE)
     target_sources(openxr_loader
         PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/android_utilities.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/android_utilities.h
         ${ANDROID_WRAP_SOURCES}
         ${JNIPP_ROOT}/jnipp.cpp
     )

src/loader/android_utilities.cpp

@@ -7,6 +7,7 @@
 
 #include "android_utilities.h"
 
+#ifdef __ANDROID__
 #include <wrap/android.net.h>
 #include <wrap/android.content.h>
 #include <wrap/android.database.h>
@@ -314,3 +315,5 @@ int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &conte
     return 0;
 }
 }  // namespace openxr_android
+
+#endif  // __ANDROID__

src/loader/android_utilities.h

@@ -6,6 +6,7 @@
 // Initial Author: Ryan Pavlik <[email protected]>
 
 #pragma once
+#ifdef __ANDROID__
 
 #include "wrap/android.content.h"
 
@@ -27,3 +28,5 @@ using wrap::android::content::Context;
  */
 int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &context, Json::Value &virtualManifest);
 }  // namespace openxr_android
+
+#endif  // __ANDROID__