diff options
| author | 2017-01-12 15:34:32 +0000 | |
|---|---|---|
| committer | 2017-01-12 15:34:32 +0000 | |
| commit | 16a30c1ac8ef32fe8b2d232697c494d0d86d196f (patch) | |
| tree | b0d7ec03dfc3d58408a9616b7125a77a4ca4439c /vulkan/libvulkan/api.cpp | |
| parent | 74ee4a06a3bc0d8b5b3dd9fc784a6b0a04c48c9d (diff) | |
| parent | d655e61a221d2b52653e5c78eb65ed6e89859bd3 (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"
am: d655e61a22
Change-Id: I86d040528ab10e503e03f033f12d47a8142c3c6b
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" |