diff options
| author | 2016-12-28 17:04:37 +0000 | |
|---|---|---|
| committer | 2016-12-28 17:04:37 +0000 | |
| commit | 430f62090cefe4630794873e30390433ad3e49a7 (patch) | |
| tree | 7be4e24bedf448832cad98fdd6f9df16e7af41eb /vulkan/libvulkan/api.cpp | |
| parent | 672886dfdd7051f66b251a8982e0657aa859baf9 (diff) | |
| parent | 7e92307cd8d5c22daeeae7cb6ab5943be0226e7a (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: 1efda0b1d6
am: 7e92307cd8
Change-Id: I1523bfc0794fe8463fb6134ae8d8c5902947de8b
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 b699fe97fc..4d30bbb965 100644 --- a/vulkan/libvulkan/api.cpp +++ b/vulkan/libvulkan/api.cpp @@ -27,8 +27,9 @@ #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" |