Fix CTS running on Android

Needed to add the ANativeActivity_onCreate function to the map file for the test library. Bug fix approved by chair for publication from internal repo prior to next regular repo update. Tested-by: Reality Merger <https://gitlab.khronos.org/openxr/openxr/-/merge_requests/3596> Part-of: <https://gitlab.khronos.org/openxr/openxr/-/merge_requests/3596>
KhronosGroup · Nov 13, 2024 · 26cd3eb · 26cd3eb
1 parent 9f3995d
commit 26cd3eb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/changes/conformance/mr.3596.gl.md b/changes/conformance/mr.3596.gl.md
@@ -0,0 +1 @@
+Fix: Broken Android builds - not runnable due to undefined symbol.
diff --git a/src/conformance/conformance_test/CMakeLists.txt b/src/conformance/conformance_test/CMakeLists.txt
@@ -177,6 +177,17 @@ elseif(APPLE)
         conformance_test
         PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/conformance_test.expsym"
     )
+elseif(ANDROID)
+    set_target_properties(
+        conformance_test
+        PROPERTIES
+            LINK_FLAGS
+            "-Wl,--version-script=\"${CMAKE_CURRENT_SOURCE_DIR}/conformance_test_android.map\""
+    )
+    target_sources(
+        conformance_test
+        PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/conformance_test_android.map"
+    )
 else()
     set_target_properties(
         conformance_test

diff --git a/src/conformance/conformance_test/conformance_test_android.map b/src/conformance/conformance_test/conformance_test_android.map
@@ -0,0 +1,16 @@
+/*
+Copyright (c) 2019-2024, The Khronos Group Inc.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+{
+    global:
+        testLayer_xrNegotiateLoaderApiLayerInterface;
+        xrcCleanup;
+        xrcEnumerateTestCases;
+        xrcRunConformanceTests;
+        ANativeActivity_onCreate;
+    local:
+        *;
+};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix: Broken Android builds - not runnable due to undefined symbol.