From 666fd6bc51ed4e2184e6b4cc1292bf2a21078e74 Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Wed, 28 May 2025 16:13:31 +0200
Subject: [PATCH] Revert "android: Link with libc++fs up to SDK 35"

This reverts commit 84cae30f0abdff7d8819ea33a1960ce673c0e9c5.

 Conflicts:
	android/Android.mk

Backport-to: 25.1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35208>
(cherry picked from commit 7e523b44002a31a35e66364db01092f56a77dcba)
---
 .pick_status.json  | 2 +-
 android/Android.mk | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index bb9ebba8c28..35777afb58c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -444,7 +444,7 @@
         "description": "Revert \"android: Link with libc++fs up to SDK 35\"",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/android/Android.mk b/android/Android.mk
index 2aaa3f7e388..ccac114fb26 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -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