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

Commit 4ef824e9 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 71619f13: am 604f52e3: Reconcile with AOSP master 

* commit '71619f13':
parents 16210c12 71619f13

include/cutils/log.h

+0 −3
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ extern "C" { 
#else

#define LOGV(...) ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__))

#endif

#define ALOGV LOGV

#endif



#define CONDITION(cond)     (__builtin_expect((cond)!=0, 0))
@@ -93,7 +92,6 @@ extern "C" { 
    ? ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

#endif

#define ALOGV_IF LOGV_IF

#endif



/*
@@ -164,7 +162,6 @@ extern "C" { 
#else

#define IF_LOGV() IF_LOG(LOG_VERBOSE, LOG_TAG)

#endif

#define IF_ALOGV IF_LOGV

#endif



/*