Skip to content

Commit ca89976

Browse files
DKLoehrChromium LUCI CQ
authored andcommitted
Fork api_layer_interface.cpp for libc++ roll
The new libc++ roll requires us to add a direct include to this file. Since it takes a while for upstream changes to roll in, fork the file until it's fixed upstream. The upstream change is KhronosGroup/OpenXR-SDK-Source#554 For ease of review, the patchsets in this CL are as follows: 1 - copy the file unchanged 2 - Make the change, update the patch and build files Note that the presubmit complained about formatting, but I wasn't able to get `git cl format` to actually do anything. Bug: 431755915 Change-Id: I0a42ccfbb1c95b8494d6590bf691578b82a7074a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6734768 Commit-Queue: Devon Loehr <dloehr@google.com> Auto-Submit: Devon Loehr <dloehr@google.com> Reviewed-by: Brandon Jones <bajones@chromium.org> Reviewed-by: Alexander Cooper <alcooper@chromium.org> Cr-Commit-Position: refs/heads/main@{#1486440}
1 parent c239811 commit ca89976

4 files changed

Lines changed: 501 additions & 1 deletion

File tree

third_party/openxr/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ if (enable_openxr) {
110110
"src/src/common/platform_utils.hpp",
111111
"src/src/common/xr_dependencies.h",
112112
"src/src/common/xr_linear.h",
113-
"src/src/loader/api_layer_interface.cpp",
114113
"src/src/loader/api_layer_interface.hpp",
115114
"src/src/loader/exception_handling.hpp",
116115
"src/src/loader/loader_core.cpp",
@@ -130,6 +129,7 @@ if (enable_openxr) {
130129
"src/src/loader/xr_generated_loader.hpp",
131130
"src/src/xr_generated_dispatch_table_core.c",
132131
"src/src/xr_generated_dispatch_table_core.h",
132+
"src_overrides/src/loader/api_layer_interface.cpp",
133133
"src_overrides/src/loader/manifest_file.cpp",
134134
]
135135

third_party/openxr/README.chromium

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ The following changes should be reflected in `src_overrides/patches`:
3535
* Forked android_utilites.cpp and manifest_file.cpp to allow for customizing to
3636
ignore loading in Android ContentProvider supplied paths while investigating and
3737
waiting for upstreaming.
38+
* Forked api_layer_interface.cpp to unblock a libc++ roll by cherry-picking
39+
https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/554
3840

3941
-------------------- DEPENDENCY DIVIDER --------------------
4042

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From fc81163b41f545c346ecdf34501f317965e03300 Mon Sep 17 00:00:00 2001
2+
From: Devon Loehr <dloehr@google.com>
3+
Date: Mon, 14 Jul 2025 16:00:47 +0000
4+
Subject: [PATCH] Add include
5+
6+
---
7+
.../openxr/src_overrides/src/loader/api_layer_interface.cpp | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/third_party/openxr/src_overrides/src/loader/api_layer_interface.cpp b/third_party/openxr/src_overrides/src/loader/api_layer_interface.cpp
11+
index a93d45da37397..178d1630ed58d 100644
12+
--- a/third_party/openxr/src_overrides/src/loader/api_layer_interface.cpp
13+
+++ b/third_party/openxr/src_overrides/src/loader/api_layer_interface.cpp
14+
@@ -19,6 +19,7 @@
15+
#include <openxr/openxr_loader_negotiation.h>
16+
17+
#include <cstring>
18+
+#include <iterator>
19+
#include <memory>
20+
#include <sstream>
21+
#include <string>
22+
--
23+
2.50.0.727.gbf7dc18ff4-goog
24+

0 commit comments

Comments
 (0)