| commit | bb68dcc8af3833e8d15102d898909563778bee85 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Mar 15 18:35:14 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 15 18:35:14 2017 +0000 |
| tree | cfb9a4235b4a9a1dd35d5e203bc5fd918dd06403 | |
| parent | ecd5b5b1a909bb6c0a821135694ea92a821ba35c [diff] | |
| parent | dde19448624ca514e0598f0343029c1ca4960c05 [diff] |
Merge "test-hwc2: fix build error from ui/mat4.h include"
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 5f90c7a..1d3a1d3 100644 --- a/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp +++ b/services/surfaceflinger/tests/hwc2/Hwc2TestBuffer.cpp
@@ -23,7 +23,7 @@ #include <gui/BufferItemConsumer.h> #include <ui/GraphicBuffer.h> -#include <ui/vec4.h> +#include <math/vec4.h> #include <GLES3/gl3.h>