Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 791b843b authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h"... 

Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h" am: b5db1258 am: 4a1f714e
am: 1e45903d

Change-Id: I1a54776b7560154304573a8cd3dfeae5babf43e5
parents 7490d243 1e45903d

camera/common/1.0/default/Exif.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>

gnss/1.0/default/GnssBatching.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 {

gnss/1.0/default/ThreadCreationWrapper.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

keymaster/3.0/default/KeymasterDevice.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>