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

Commit d4acfd75 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: use log/log.h when utilizing ALOG macros" am: 818ffb15 am: ca5117d1 

am: 7c324079

Change-Id: I74c378d0d67bd4bd95a757712d56b94ca542ab02
parents 9ad3abe7 7c324079

boot/1.0/default/BootControl.cpp

+2 −1
Original line number Diff line number Diff line 
#define LOG_TAG "android.hardware.boot@1.0-impl"

#include <android/log.h>



#include <log/log.h>



#include <hardware/hardware.h>

#include <hardware/boot_control.h>

ir/1.0/default/ConsumerIr.cpp

+3 −1
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ 
 */



#define LOG_TAG "ConsumerIrService"

#include <android/log.h>



#include <log/log.h>



#include <hardware/hardware.h>

#include <hardware/consumerir.h>



#include "ConsumerIr.h"



namespace android {

nfc/1.0/default/Nfc.cpp

+2 −1
Original line number Diff line number Diff line 
#define LOG_TAG "android.hardware.nfc@1.0-impl"

#include <android/log.h>



#include <log/log.h>



#include <hardware/hardware.h>

#include <hardware/nfc.h>

tests/bar/1.0/default/Bar.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,11 @@ 
#define LOG_TAG "hidl_test"



#include "Bar.h"

#include <android/log.h>



#include <inttypes.h>



#include <log/log.h>



namespace android {

namespace hardware {

namespace tests {

tests/inheritance/1.0/default/Child.cpp

+2 −1
Original line number Diff line number Diff line 
#define LOG_TAG "hidl_test"

#include <android/log.h>



#include <log/log.h>



#include "Child.h"