diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-08 22:58:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-08 22:58:16 +0000 |
| commit | 9a309ea8c7464033324ab5dba380aadfba785da0 (patch) | |
| tree | 24413534deb24f2bf2b4240cffab97e424698b75 | |
| parent | 1b18433925584285a4d31114394c070acada3852 (diff) | |
| parent | b292e3e16bafea50251ee17177634340a9c0273f (diff) | |
| download | goldfish-opengl-9a309ea8c7464033324ab5dba380aadfba785da0.tar.gz | |
Merge "goldfish-opengl: remove Orea + JellyBean specific code" am: b292e3e16b
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1914151
Change-Id: Ia9450a23371c173f1c7f6db1988105eb05e29813
| -rw-r--r-- | system/OpenglSystemCommon/EGLImage.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/system/OpenglSystemCommon/EGLImage.h b/system/OpenglSystemCommon/EGLImage.h index 8a1eb6dc..fe320b22 100644 --- a/system/OpenglSystemCommon/EGLImage.h +++ b/system/OpenglSystemCommon/EGLImage.h @@ -23,14 +23,8 @@ #include <hardware/hardware.h> #include <hardware/gralloc.h> -#if PLATFORM_SDK_VERSION >= 16 -#if EMULATOR_OPENGL_POST_O >= 1 #include <nativebase/nativebase.h> -#endif #include <cutils/native_handle.h> -#else // PLATFORM_SDK_VERSION >= 16 -#include <private/ui/android_natives_priv.h> -#endif // PLATFORM_SDK_VERSION >= 16 struct EGLImage_t { |