fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 17:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: Link with libc++fs up to SDK 35

Browse source 
Before SDK35 the c++ filesystem API was part of a standalone library

Reviewed-by: Mauro Rossi <issor.oruam@gmail.com>
Backport-to: 25.1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34797>
(cherry picked from commit 84cae30f0a)
This commit is contained in:
Alessandro Astone 2025-05-03 12:00:27 +02:00 • committed by Eric Engestrom
parent b0b1820098
commit 4e65cf4f40
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -654,7 +654,7 @@
"description": "android: Link with libc++fs up to SDK 35", "description": "android: Link with libc++fs up to SDK 35",
"nominated": true, "nominated": true,
"nomination_type": 4, "nomination_type": 4,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

5
android/Android.mk
View file

@ -51,6 +51,11 @@ LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers
MESON_GEN_PKGCONFIGS := log cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf MESON_GEN_PKGCONFIGS := log cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf
LOCAL_CFLAGS += $(BOARD_MESA3D_CFLAGS) LOCAL_CFLAGS += $(BOARD_MESA3D_CFLAGS)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 35; echo $$?), 0)
# Before SDK35 the c++ filesystem API was part of a standalone library
LOCAL_STATIC_LIBRARIES += libc++fs
endif
ifneq ($(filter swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),) ifneq ($(filter swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),)
ifeq ($(BOARD_MESA3D_FORCE_SOFTPIPE),) ifeq ($(BOARD_MESA3D_FORCE_SOFTPIPE),)
MESON_GEN_LLVM_STUB := true MESON_GEN_LLVM_STUB := true