diff options
| author | 2017-01-12 08:35:35 -0800 | |
|---|---|---|
| committer | 2017-01-12 08:36:11 -0800 | |
| commit | e0ea99cc4ba89452b9b6b1baa33bddcb11f3351a (patch) | |
| tree | 1c90d7dda6cbd815a854cd35432d43064d2e1daa /vulkan/libvulkan/driver.cpp | |
| parent | ba4d92cc90b5d2a902e898211f04311a0ae2493b (diff) | |
| parent | a2c2d11f98b692401be56c8f285c570bae47ddda (diff) | |
resolve merge conflicts of a2c2d11f9 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I84d0ffa430df3beca0dcc6ed205ce220d7be1f87
Diffstat (limited to 'vulkan/libvulkan/driver.cpp')
| -rw-r--r-- | vulkan/libvulkan/driver.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index 8b9b9d2aa1..800e474e8a 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -14,13 +14,16 @@ * limitations under the License. */ +#include <malloc.h> #include <stdlib.h> #include <string.h> +#include <sys/prctl.h> + #include <algorithm> #include <array> #include <new> -#include <malloc.h> -#include <sys/prctl.h> + +#include <log/log.h> #include "driver.h" #include "stubhal.h" |