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

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

Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb9 am: 6143cbf1 

am: ef8ccc85

Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
parents 46c39f6c ef8ccc85

core/java/android/util/EventLog.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class EventLog { 
        private final ByteBuffer mBuffer;



        // Layout of event log entry received from Android logger.

        //  see system/core/include/log/logger.h

        //  see system/core/include/log/log.h

        private static final int LENGTH_OFFSET = 0;

        private static final int HEADER_SIZE_OFFSET = 2;

        private static final int PROCESS_OFFSET = 4;

core/jni/android/graphics/HarfBuzzNGFaceSkia.cpp

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ 
#include "HarfBuzzNGFaceSkia.h"



#include <stdlib.h>

#include <cutils/log.h>



#include <log/log.h>



#include <SkPaint.h>

#include <SkPath.h>

#include <SkPoint.h>

core/jni/android_os_Debug.cpp

+14 −14
Original line number Diff line number Diff line
@@ -16,32 +16,32 @@ 


#define LOG_TAG "android.os.Debug"



#include <assert.h>

#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

#include <inttypes.h>

#include <malloc.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include <time.h>

#include <sys/time.h>

#include <errno.h>

#include <assert.h>

#include <ctype.h>

#include <malloc.h>

#include <time.h>

#include <unistd.h>



#include <iomanip>

#include <string>



#include "jni.h"

#include <android-base/stringprintf.h>

#include <cutils/debugger.h>

#include <log/log.h>

#include <utils/misc.h>

#include <utils/String8.h>



#include "android-base/stringprintf.h"

#include "cutils/debugger.h"

#include "cutils/log.h"

#include "JNIHelp.h"

#include "memtrack/memtrack.h"

#include "memunreachable/memunreachable.h"

#include "utils/misc.h"

#include "utils/String8.h"

#include "jni.h"

#include <memtrack/memtrack.h>

#include <memunreachable/memunreachable.h>



namespace android

{

core/jni/android_os_Trace.cpp

+4 −5
Original line number Diff line number Diff line
@@ -19,15 +19,14 @@ 


#include <inttypes.h>



#include <cutils/trace.h>

#include <utils/String8.h>

#include <log/log.h>



#include <JNIHelp.h>

#include <ScopedUtfChars.h>

#include <ScopedStringChars.h>



#include <utils/String8.h>



#include <cutils/trace.h>

#include <cutils/log.h>



namespace android {



static void sanitizeString(String8& utf8Chars) {

core/jni/android_util_Binder.cpp

+8 −8
Original line number Diff line number Diff line
@@ -29,19 +29,19 @@ 
#include <sys/types.h>

#include <unistd.h>



#include <utils/Atomic.h>

#include <binder/IInterface.h>

#include <binder/IServiceManager.h>

#include <binder/IPCThreadState.h>

#include <utils/Log.h>

#include <utils/SystemClock.h>

#include <utils/List.h>

#include <utils/KeyedVector.h>

#include <log/logger.h>

#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <utils/threads.h>

#include <log/log.h>

#include <utils/Atomic.h>

#include <utils/KeyedVector.h>

#include <utils/List.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <utils/SystemClock.h>

#include <utils/threads.h>



#include <ScopedUtfChars.h>

#include <ScopedLocalRef.h>