| commit | dde19448624ca514e0598f0343029c1ca4960c05 | [log] [tgz] |
|---|---|---|
| author | Marissa Wall <marissaw@google.com> | Tue Mar 14 13:06:04 2017 -0700 |
| committer | Marissa Wall <marissaw@google.com> | Tue Mar 14 15:05:51 2017 -0700 |
| tree | 3511de1689a1160f856596e167c7dcd466d082f3 | |
| parent | 7311c4a899bc549dc4cc6141d3f97d17ea8eb396 [diff] |
test-hwc2: fix build error from ui/mat4.h include ui/mat4.h is located at math/mat4.h on internal master. Change test cases to reflect that. Test: run the test-hwc2 tests Change-Id: I1d2fb59efc2fcea40dc901664dc43841c5454353
diff --git a/services/surfaceflinger/tests/hwc2/Android.mk b/services/surfaceflinger/tests/hwc2/Android.mk index b8c2133..203ced5 100644 --- a/services/surfaceflinger/tests/hwc2/Android.mk +++ b/services/surfaceflinger/tests/hwc2/Android.mk
@@ -40,7 +40,8 @@ LOCAL_STATIC_LIBRARIES := \ libbase \ libadf \ - libadfhwc + libadfhwc \ + libmath LOCAL_SRC_FILES := \ Hwc2Test.cpp \ Hwc2TestProperties.cpp \
diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp b/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp index a59f388..0b84184 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp
@@ -24,7 +24,7 @@ #include <gui/GraphicBufferAlloc.h> #include <ui/GraphicBuffer.h> -#include <ui/vec4.h> +#include <math/vec4.h> #include <GLES3/gl3.h>