From 833850c606da619cae741dfd13066929b96cff95 Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Mon, 22 Jan 2024 09:39:31 -0800
Subject: [PATCH] gfxstream: reduce use of PLATFORM_SDK_VERSION

It's way past API-level 26 now.

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
---
 .../guest/GoldfishAddressSpace/AddressSpaceStream.cpp        | 5 -----
 .../guest/vulkan_enc/CommandBufferStagingStream.cpp          | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp b/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp
index ab85e9f9ef9..7068fab8af3 100644
--- a/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp
+++ b/src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp
@@ -29,12 +29,7 @@
 #if defined(__ANDROID__)
 #include "android-base/properties.h"
 #endif
-#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
-
 
 static const size_t kReadSize = 512 * 1024;
 static const size_t kWriteOffset = kReadSize;
diff --git a/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp b/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp
index 63db2fa2439..563aad4faae 100644
--- a/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp
+++ b/src/gfxstream/guest/vulkan_enc/CommandBufferStagingStream.cpp
@@ -15,11 +15,7 @@
  */
 #include "CommandBufferStagingStream.h"
 
-#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
 #include <cutils/properties.h>
 #include <errno.h>
 #include <stdio.h>