AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 84cae30f0a.

 Conflicts:
	android/Android.mk

Backport-to: 25.1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35208>
This commit is contained in:
Mauro Rossi
2025-05-28 16:13:31 +02:00
committed by Marge Bot
parent 9fd6bae3c4
commit 7e523b4400
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/Android.mk
View File

@@ -51,11 +51,6 @@ LOCAL_HEADER_LIBRARIES := libnativebase_headers hwvulkan_headers
MESON_GEN_PKGCONFIGS := log cutils expat hardware libdrm:$(LIBDRM_VERSION) nativewindow sync zlib:1.2.11 libelf
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 llvmpipe swrast,$(BOARD_MESA3D_GALLIUM_DRIVERS) $(BOARD_MESA3D_VULKAN_DRIVERS)),)
ifeq ($(BOARD_MESA3D_FORCE_SOFTPIPE),)
MESON_GEN_LLVM_STUB := true