commit f62690cdaf7e59019101b0b4edbaaffe15fd33db
author Yunlian Jiang <yunlian@google.com> Fri Feb 03 02:46:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 03 02:46:15 2017 +0000
tree 97875372c1e8be33ce1b78f074066bd77a20d690
parent 9046024ef11863c7fd1d7289362db8945256ce6c
parent 909ef30a63032f4cada67303ab022be9b7a458da

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

Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa

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,