From 76370c1edf0e34cdf0ba53ef8a3ba84d2e465ed7 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Sat, 30 Aug 2025 06:32:25 +0000
Subject: [PATCH] tu: drop redundant Android headers

compile and cross-compile tested

Acked-by: Connor Abbott <cwabbott0@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37099>
---
 src/freedreno/vulkan/tu_android.h         | 15 ---------------
 src/freedreno/vulkan/tu_common.h          |  1 -
 src/freedreno/vulkan/tu_descriptor_set.cc |  2 --
 src/freedreno/vulkan/tu_device.cc         |  1 -
 src/freedreno/vulkan/tu_formats.cc        |  3 ---
 src/freedreno/vulkan/tu_image.cc          |  1 -
 6 files changed, 23 deletions(-)
 delete mode 100644 src/freedreno/vulkan/tu_android.h

diff --git a/src/freedreno/vulkan/tu_android.h b/src/freedreno/vulkan/tu_android.h
deleted file mode 100644
index 7d66ec1107c..00000000000
--- a/src/freedreno/vulkan/tu_android.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright © 2016 Red Hat.
- * Copyright © 2016 Bas Nieuwenhuizen
- * SPDX-License-Identifier: MIT
- *
- * based in part on anv driver which is:
- * Copyright © 2015 Intel Corporation
- */
-
-#ifndef TU_ANDROID_H
-#define TU_ANDROID_H
-
-#include "tu_common.h"
-
-#endif /* TU_ANDROID_H */
diff --git a/src/freedreno/vulkan/tu_common.h b/src/freedreno/vulkan/tu_common.h
index e92a3effbb0..b5307124d2f 100644
--- a/src/freedreno/vulkan/tu_common.h
+++ b/src/freedreno/vulkan/tu_common.h
@@ -61,7 +61,6 @@
 #include "common/freedreno_common.h"
 #include "perfcntrs/freedreno_perfcntr.h"
 
-#include <vulkan/vk_android_native_buffer.h>
 #include <vulkan/vk_icd.h>
 #include <vulkan/vulkan.h>
 
diff --git a/src/freedreno/vulkan/tu_descriptor_set.cc b/src/freedreno/vulkan/tu_descriptor_set.cc
index ff4e286cc30..23236085fa7 100644
--- a/src/freedreno/vulkan/tu_descriptor_set.cc
+++ b/src/freedreno/vulkan/tu_descriptor_set.cc
@@ -21,8 +21,6 @@
 
 #include <fcntl.h>
 
-#include "vulkan/vulkan_android.h"
-
 #include "util/mesa-sha1.h"
 #include "vk_descriptors.h"
 #include "vk_util.h"
diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc
index d392f52113e..a0aed2d58fb 100644
--- a/src/freedreno/vulkan/tu_device.cc
+++ b/src/freedreno/vulkan/tu_device.cc
@@ -45,7 +45,6 @@
 #include "tu_wsi.h"
 
 #if DETECT_OS_ANDROID
-#include "util/u_gralloc/u_gralloc.h"
 #include <vndk/hardware_buffer.h>
 #endif
 
diff --git a/src/freedreno/vulkan/tu_formats.cc b/src/freedreno/vulkan/tu_formats.cc
index 53d793e8028..8bf9f296469 100644
--- a/src/freedreno/vulkan/tu_formats.cc
+++ b/src/freedreno/vulkan/tu_formats.cc
@@ -15,12 +15,9 @@
 #include "vk_acceleration_structure.h"
 #include "drm-uapi/drm_fourcc.h"
 
-#include "tu_android.h"
 #include "tu_device.h"
 #include "tu_image.h"
 
-#include <vulkan/vulkan_android.h>
-
 static bool
 tu6_format_vtx_supported(enum pipe_format format)
 {
diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc
index 08b9dec9e48..8880257dfcf 100644
--- a/src/freedreno/vulkan/tu_image.cc
+++ b/src/freedreno/vulkan/tu_image.cc
@@ -14,7 +14,6 @@
 
 #include "util/u_debug.h"
 #include "util/format/u_format.h"
-#include "vulkan/vulkan_android.h"
 #include "vk_android.h"
 #include "vk_debug_utils.h"
 #include "vk_util.h"