| commit | 6a3c05bcfab588fd99dd8d619a53d15374e99507 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Thu Apr 27 20:06:55 2017 -0700 |
| committer | Mathias Agopian <mathias@google.com> | Tue May 09 16:42:31 2017 -0700 |
| tree | 30e5edaa74ea3dff07579a5a9cd39f1755069eb3 | |
| parent | 37c27efdf8232272648e56513f3caceeb5c66407 [diff] |
fix circular dependency libnativewindow <-> libui Bug: 37647680 Bug: 37648355 Test: compile, manual Change-Id: I9631beea52e23ebb519411f943c6f5062aedd2e5
diff --git a/libs/vr/libdisplay/graphics.cpp b/libs/vr/libdisplay/graphics.cpp index 36f8095..cc140af 100644 --- a/libs/vr/libdisplay/graphics.cpp +++ b/libs/vr/libdisplay/graphics.cpp
@@ -27,7 +27,7 @@ #include <private/dvr/sensor_constants.h> #include <private/dvr/vsync_client.h> -#include <android/native_window.h> +#include <system/window.h> #ifndef EGL_CONTEXT_MAJOR_VERSION #define EGL_CONTEXT_MAJOR_VERSION 0x3098
diff --git a/libs/vr/libdisplay/include/private/dvr/dummy_native_window.h b/libs/vr/libdisplay/include/private/dvr/dummy_native_window.h index b03eeaa..b9c1067 100644 --- a/libs/vr/libdisplay/include/private/dvr/dummy_native_window.h +++ b/libs/vr/libdisplay/include/private/dvr/dummy_native_window.h
@@ -3,6 +3,7 @@ #include <android/native_window.h> #include <ui/ANativeObjectBase.h> +#include <system/window.h> namespace android { namespace dvr {