commit 501e019523a5548b874274a8db85c8b3e5177ae9
author Yunlian Jiang <yunlian@google.com> Fri Feb 03 02:51:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 03 02:51:14 2017 +0000
tree 0861ceee74cf9692d11577eea336f3577da8f16c
parent 0ad32353302bcd8543e05587222be401387f1fb4
parent d1f7b9d02502c8b1b59a8873c74bf26ae288db6d

Merge "Fix warning: macro redefined" am: 909ef30a63 am: f62690cdaf
am: d1f7b9d025

Change-Id: Ifa71e97d5ade8685f2f31400afd1727034321b4d

libs/gui/tests/SRGB_test.cpp

diff --git a/libs/gui/tests/SRGB_test.cpp b/libs/gui/tests/SRGB_test.cpp
index 3b11b97..c2640cd 100644
--- a/libs/gui/tests/SRGB_test.cpp
+++ b/libs/gui/tests/SRGB_test.cpp
@@ -435,9 +435,6 @@
     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,