diff options
| author | 2017-01-12 15:48:18 +0000 | |
|---|---|---|
| committer | 2017-01-12 15:48:18 +0000 | |
| commit | fbc97581511f1fa6aba808a970afa912706fbdea (patch) | |
| tree | 8fb12fcdb9361099336ee3ce214d457ced1caf49 /vulkan/libvulkan/api.cpp | |
| parent | 70a7c384312e314b4af6cfe25a35820d354d0d8a (diff) | |
| parent | 16a30c1ac8ef32fe8b2d232697c494d0d86d196f (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22
am: 16a30c1ac8
Change-Id: I697418fbab0dbbd447d0dca2eda5b1545cc2522e
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
| -rw-r--r-- | vulkan/libvulkan/api.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp index 4d30bbb965..36755a2b6e 100644 --- a/vulkan/libvulkan/api.cpp +++ b/vulkan/libvulkan/api.cpp @@ -23,13 +23,14 @@ #include <stdlib.h> #include <string.h> + #include <algorithm> #include <mutex> #include <new> #include <utility> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <vulkan/vk_layer_interface.h> #include "api.h" |