Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26191364 authored by Yunlian Jiang's avatar Yunlian Jiang Committed by android-build-merger
Browse files

Merge "Fix warning: macro redefined" am: 909ef30a am: f62690cd am: d1f7b9d0

am: 501e0195

Change-Id: I2155e7df5ffd16a967d4465218cf852c9148f884
parents eb7d088b 501e0195
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -435,9 +435,6 @@ TEST_F(SRGBTest, DISABLED_RenderToSRGBSurface) {
    ASSERT_EQ(NO_ERROR, mCpuConsumer->unlockBuffer(mLockedBuffer));

    // Switch to SRGB window surface
#define EGL_GL_COLORSPACE_KHR      EGL_VG_COLORSPACE
#define EGL_GL_COLORSPACE_SRGB_KHR EGL_VG_COLORSPACE_sRGB

    static const int srgbAttribs[] = {
        EGL_GL_COLORSPACE_KHR, EGL_GL_COLORSPACE_SRGB_KHR,
        EGL_NONE,