diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-02-01 13:22:37 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-01 13:22:37 -0800 |
| commit | 791b843bcb2b4f2fcc48961b021c0c60e9c172ec (patch) | |
| tree | 1587601f24c7cbd6ebc01b1ed077a611cbc6cd06 /gnss | |
| parent | 7490d24374f12e1d3882de96be0b587d8563075f (diff) | |
| parent | 1e45903dd51de24ee4205064892788b9b172df14 (diff) | |
| download | android_hardware_interfaces-791b843bcb2b4f2fcc48961b021c0c60e9c172ec.tar.gz android_hardware_interfaces-791b843bcb2b4f2fcc48961b021c0c60e9c172ec.tar.bz2 android_hardware_interfaces-791b843bcb2b4f2fcc48961b021c0c60e9c172ec.zip | |
Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h" am: b5db125860 am: 4a1f714ed0
am: 1e45903dd5
Change-Id: I1a54776b7560154304573a8cd3dfeae5babf43e5
Diffstat (limited to 'gnss')
| -rw-r--r-- | gnss/1.0/default/GnssBatching.cpp | 2 | ||||
| -rw-r--r-- | gnss/1.0/default/ThreadCreationWrapper.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnss/1.0/default/GnssBatching.cpp b/gnss/1.0/default/GnssBatching.cpp index 02b38cb63..f2e2e4502 100644 --- a/gnss/1.0/default/GnssBatching.cpp +++ b/gnss/1.0/default/GnssBatching.cpp @@ -20,7 +20,7 @@ #include <Gnss.h> // for wakelock consolidation #include <GnssUtils.h> -#include <cutils/log.h> // for ALOGE +#include <android/log.h> // for ALOGE #include <vector> namespace android { diff --git a/gnss/1.0/default/ThreadCreationWrapper.h b/gnss/1.0/default/ThreadCreationWrapper.h index df0a9e4a9..f401ce2ce 100644 --- a/gnss/1.0/default/ThreadCreationWrapper.h +++ b/gnss/1.0/default/ThreadCreationWrapper.h @@ -17,9 +17,9 @@ #ifndef ANDROID_HARDWARE_GNSS_THREADCREATIONWRAPPER_H #define ANDROID_HARDWARE_GNSS_THREADCREATIONWRAPPER_H +#include <log/log.h> #include <pthread.h> #include <vector> -#include <cutils/log.h> typedef void (*threadEntryFunc)(void* ret); |