Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h" am: b5db125860
am: 4a1f714ed0
am: 1e45903dd5
Change-Id: I1a54776b7560154304573a8cd3dfeae5babf43e5
This commit is contained in:
commit
791b843bcb
4 changed files with 4 additions and 4 deletions
|
@ -18,7 +18,7 @@
|
||||||
#define ATRACE_TAG ATRACE_TAG_CAMERA
|
#define ATRACE_TAG ATRACE_TAG_CAMERA
|
||||||
//#define LOG_NDEBUG 0
|
//#define LOG_NDEBUG 0
|
||||||
|
|
||||||
#include <cutils/log.h>
|
#include <android/log.h>
|
||||||
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include <Gnss.h> // for wakelock consolidation
|
#include <Gnss.h> // for wakelock consolidation
|
||||||
#include <GnssUtils.h>
|
#include <GnssUtils.h>
|
||||||
|
|
||||||
#include <cutils/log.h> // for ALOGE
|
#include <android/log.h> // for ALOGE
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace android {
|
namespace android {
|
||||||
|
|
|
@ -17,9 +17,9 @@
|
||||||
#ifndef ANDROID_HARDWARE_GNSS_THREADCREATIONWRAPPER_H
|
#ifndef ANDROID_HARDWARE_GNSS_THREADCREATIONWRAPPER_H
|
||||||
#define ANDROID_HARDWARE_GNSS_THREADCREATIONWRAPPER_H
|
#define ANDROID_HARDWARE_GNSS_THREADCREATIONWRAPPER_H
|
||||||
|
|
||||||
|
#include <log/log.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cutils/log.h>
|
|
||||||
|
|
||||||
typedef void (*threadEntryFunc)(void* ret);
|
typedef void (*threadEntryFunc)(void* ret);
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "KeymasterDevice.h"
|
#include "KeymasterDevice.h"
|
||||||
|
|
||||||
#include <cutils/log.h>
|
#include <log/log.h>
|
||||||
|
|
||||||
#include <AndroidKeymaster3Device.h>
|
#include <AndroidKeymaster3Device.h>
|
||||||
#include <hardware/keymaster0.h>
|
#include <hardware/keymaster0.h>
|
||||||
|
|
Loading…
Reference in a new issue