gfxstream: reduce use of PLATFORM_SDK_VERSION am: f23a10eb50
Original change: https://android-review.googlesource.com/c/platform/hardware/google/gfxstream/+/2923512
Change-Id: Ie92efc40067459a9c64297e23e83e8f31ba0c495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: c934b9ea15748d0264c33cb355993d309b19fe35
diff --git a/guest/BUILD.gn b/guest/BUILD.gn
index 9e09acd..276ecaa 100644
--- a/guest/BUILD.gn
+++ b/guest/BUILD.gn
@@ -19,7 +19,6 @@
"GOLDFISH_NO_GL",
"VK_GFXSTREAM_STRUCTURE_TYPE_EXT",
"VK_USE_PLATFORM_FUCHSIA",
- "PLATFORM_SDK_VERSION=1",
"PAGE_SIZE=4096",
"VIRTIO_GPU=1",
]
diff --git a/guest/GoldfishAddressSpace/AddressSpaceStream.cpp b/guest/GoldfishAddressSpace/AddressSpaceStream.cpp
index ab85e9f..7068fab 100644
--- a/guest/GoldfishAddressSpace/AddressSpaceStream.cpp
+++ b/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/guest/GoldfishAddressSpace/include/goldfish_address_space_host.impl b/guest/GoldfishAddressSpace/include/goldfish_address_space_host.impl
index e4283c7..51cd9f6 100644
--- a/guest/GoldfishAddressSpace/include/goldfish_address_space_host.impl
+++ b/guest/GoldfishAddressSpace/include/goldfish_address_space_host.impl
@@ -17,11 +17,7 @@
#include <memory>
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#include <errno.h>
#include "goldfish_address_space.h"
diff --git a/guest/OpenglCodecCommon/GLClientState.cpp b/guest/OpenglCodecCommon/GLClientState.cpp
index 968dbd0..3002a87 100644
--- a/guest/OpenglCodecCommon/GLClientState.cpp
+++ b/guest/OpenglCodecCommon/GLClientState.cpp
@@ -22,11 +22,7 @@
#include <string.h>
#include "glUtils.h"
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#ifndef MAX
#define MAX(a, b) ((a) < (b) ? (b) : (a))
diff --git a/guest/OpenglCodecCommon/GLESTextureUtils.cpp b/guest/OpenglCodecCommon/GLESTextureUtils.cpp
index b5f48fb..14b8a7c 100644
--- a/guest/OpenglCodecCommon/GLESTextureUtils.cpp
+++ b/guest/OpenglCodecCommon/GLESTextureUtils.cpp
@@ -6,11 +6,7 @@
#include "gfxstream/etc.h"
#include "astc-codec.h"
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#define ASTC_FORMATS_LIST(EXPAND_MACRO) \
EXPAND_MACRO(GL_COMPRESSED_RGBA_ASTC_4x4_KHR, astc_codec::FootprintType::k4x4, false) \
diff --git a/guest/OpenglCodecCommon/glUtils.h b/guest/OpenglCodecCommon/glUtils.h
index bfd05a4..0121b90 100644
--- a/guest/OpenglCodecCommon/glUtils.h
+++ b/guest/OpenglCodecCommon/glUtils.h
@@ -16,11 +16,7 @@
#ifndef __GL_UTILS_H__
#define __GL_UTILS_H__
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
diff --git a/guest/OpenglSystemCommon/FormatConversions.cpp b/guest/OpenglSystemCommon/FormatConversions.cpp
index aae6bb9..d092be6 100644
--- a/guest/OpenglSystemCommon/FormatConversions.cpp
+++ b/guest/OpenglSystemCommon/FormatConversions.cpp
@@ -15,11 +15,7 @@
#include <hardware/gralloc.h>
#include "FormatConversions.h"
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#include <string.h>
#include <stdio.h>
diff --git a/guest/OpenglSystemCommon/HostConnection.cpp b/guest/OpenglSystemCommon/HostConnection.cpp
index 8bba0e8..7e2d183 100644
--- a/guest/OpenglSystemCommon/HostConnection.cpp
+++ b/guest/OpenglSystemCommon/HostConnection.cpp
@@ -132,11 +132,7 @@
#undef LOG_TAG
#define LOG_TAG "HostConnection"
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#define STREAM_BUFFER_SIZE (4*1024*1024)
#define STREAM_PORT_NUM 22468
diff --git a/guest/OpenglSystemCommon/QemuPipeStream.cpp b/guest/OpenglSystemCommon/QemuPipeStream.cpp
index d5fca2b..91a4051 100644
--- a/guest/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/guest/OpenglSystemCommon/QemuPipeStream.cpp
@@ -16,11 +16,7 @@
#include "QemuPipeStream.h"
#include <qemu_pipe_bp.h>
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/guest/egl/egl.cpp b/guest/egl/egl.cpp
index 4fe27c9..b7aadfc 100644
--- a/guest/egl/egl.cpp
+++ b/guest/egl/egl.cpp
@@ -27,11 +27,7 @@
#include "eglDisplay.h"
#include "eglSync.h"
#include "egl_ftable.h"
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#include <cutils/properties.h>
#include "goldfish_sync.h"
#include "gfxstream/guest/GLClientState.h"
@@ -2280,16 +2276,10 @@
case HAL_PIXEL_FORMAT_RGB_565:
case HAL_PIXEL_FORMAT_YV12:
case HAL_PIXEL_FORMAT_BGRA_8888:
-#if PLATFORM_SDK_VERSION >= 26
case HAL_PIXEL_FORMAT_RGBA_FP16:
case HAL_PIXEL_FORMAT_RGBA_1010102:
-#endif
-#if PLATFORM_SDK_VERSION >= 28
case HAL_PIXEL_FORMAT_YCBCR_420_888:
-#endif
-#if PLATFORM_SDK_VERSION >= 30
case HAL_PIXEL_FORMAT_YCBCR_P010:
-#endif
break;
case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
ALOGW("%s:%d using HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED\n", __func__, __LINE__);
diff --git a/guest/egl/eglDisplay.cpp b/guest/egl/eglDisplay.cpp
index f00421d..16ad925 100644
--- a/guest/egl/eglDisplay.cpp
+++ b/guest/egl/eglDisplay.cpp
@@ -265,11 +265,7 @@
#endif // !__APPLE__
#ifndef HOST_BUILD
-#if PLATFORM_SDK_VERSION >= 26
-#define PARTITION "/vendor"
-#else
#define PARTITION "/system"
-#endif // !PLATFORM_SDK_VERSION >= 26
#if __LP64__
#define LIBDIR "/lib64/egl/"
#else
diff --git a/guest/qemupipe/qemu_pipe_host.cpp b/guest/qemupipe/qemu_pipe_host.cpp
index ba451f5..9dbeb64 100644
--- a/guest/qemupipe/qemu_pipe_host.cpp
+++ b/guest/qemupipe/qemu_pipe_host.cpp
@@ -16,11 +16,7 @@
#include "host-common/HostGoldfishPipe.h"
-#if PLATFORM_SDK_VERSION < 26
#include <cutils/log.h>
-#else
-#include <log/log.h>
-#endif
#include <errno.h>
diff --git a/guest/vulkan_enc/CommandBufferStagingStream.cpp b/guest/vulkan_enc/CommandBufferStagingStream.cpp
index 63db2fa..563aad4 100644
--- a/guest/vulkan_enc/CommandBufferStagingStream.cpp
+++ b/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>
