diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-04-12 15:05:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 15:05:11 +0000 |
| commit | 7c451a9347f39b82113d5cfae36bf4de67c5171a (patch) | |
| tree | f25e5b360739e6791624fe5061e73e0d0d373c8e /modules/hwcomposer/hwcomposer.cpp | |
| parent | 0dd6f81579a9f1450f9cd7971aa143e5bf7ef975 (diff) | |
| parent | 96e218f8eeb204b0003369e24fb17f60cfb0df74 (diff) | |
Merge "libhardware: deprecate cutils/log.h" am: 2aca8ea500
am: 96e218f8ee
Change-Id: Ia8dd2f44e0f41c739e47886d966c34db39e41314
Diffstat (limited to 'modules/hwcomposer/hwcomposer.cpp')
| -rw-r--r-- | modules/hwcomposer/hwcomposer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/hwcomposer/hwcomposer.cpp b/modules/hwcomposer/hwcomposer.cpp index 9d1aa34f..297cafd8 100644 --- a/modules/hwcomposer/hwcomposer.cpp +++ b/modules/hwcomposer/hwcomposer.cpp @@ -14,15 +14,14 @@ * limitations under the License. */ -#include <hardware/hardware.h> - #include <errno.h> #include <fcntl.h> #include <malloc.h> -#include <cutils/log.h> #include <cutils/atomic.h> +#include <log/log.h> +#include <hardware/hardware.h> #include <hardware/hwcomposer.h> #include <EGL/egl.h> |