| 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/vulkan/include/vulkan/vk_android_native_buffer.h b/vulkan/include/vulkan/vk_android_native_buffer.h index 43a9a9c..d3e5f0f 100644 --- a/vulkan/include/vulkan/vk_android_native_buffer.h +++ b/vulkan/include/vulkan/vk_android_native_buffer.h
@@ -17,7 +17,7 @@ #ifndef __VK_ANDROID_NATIVE_BUFFER_H__ #define __VK_ANDROID_NATIVE_BUFFER_H__ -#include <system/window.h> +#include <cutils/native_handle.h> #include <vulkan/vulkan.h> #ifdef __cplusplus
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index caa2674..cb893aa 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp
@@ -22,6 +22,7 @@ #include <sync/sync.h> #include <utils/StrongPointer.h> #include <utils/Vector.h> +#include <system/window.h> #include "driver.h"