libutils clean-up (002e1e58) · Commits · e / os / android_frameworks_native

cmds/dumpsys/dumpsys.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		#include <binder/Parcel.h>
		#include <binder/ProcessState.h>
		#include <binder/IServiceManager.h>
		#include <utils/TextOutput.h>
		#include <binder/TextOutput.h>
		#include <utils/Vector.h>

		#include <getopt.h>

cmds/service/service.cpp

+14 −3

Original line number	Diff line number	Diff line
		/*
		* Command line access to services.
		* Copyright 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <binder/Parcel.h>
		#include <binder/ProcessState.h>
		#include <binder/IServiceManager.h>
		#include <utils/TextOutput.h>
		#include <binder/TextOutput.h>

		#include <getopt.h>
		#include <stdlib.h>

include/utils/BufferedTextOutput.h→include/binder/BufferedTextOutput.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		#ifndef ANDROID_BUFFEREDTEXTOUTPUT_H
		#define ANDROID_BUFFEREDTEXTOUTPUT_H

		#include <utils/TextOutput.h>
		#include <binder/TextOutput.h>
		#include <utils/threads.h>
		#include <cutils/uio.h>

include/private/utils/Static.h→include/binder/Debug.h

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (C) 2005 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -14,22 +14,36 @@
		* limitations under the License.
		*/

		// All static variables go here, to control initialization and
		// destruction order in the library.
		#ifndef ANDROID_BINDER_DEBUG_H
		#define ANDROID_BINDER_DEBUG_H

		#include <utils/threads.h>
		#include <utils/KeyedVector.h>
		#include <stdint.h>
		#include <sys/types.h>

		namespace android {
		// For TextStream.cpp
		extern Vector<int32_t> gTextBuffers;
		// ---------------------------------------------------------------------------

		// For String8.cpp
		extern void initialize_string8();
		extern void terminate_string8();
		#ifdef __cplusplus
		extern "C" {
		#endif

		// For String16.cpp
		extern void initialize_string16();
		extern void terminate_string16();
		const char* stringForIndent(int32_t indentLevel);

		} // namespace android
		typedef void (debugPrintFunc)(void cookie, const char* txt);

		void printTypeCode(uint32_t typeCode,
		debugPrintFunc func = 0, void* cookie = 0);

		void printHexData(int32_t indent, const void *buf, size_t length,
		size_t bytesPerLine=16, int32_t singleLineBytesCutoff=16,
		size_t alignment=0, bool cArrayStyle=false,
		debugPrintFunc func = 0, void* cookie = 0);

		#ifdef __cplusplus
		}
		#endif

		// ---------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_BINDER_DEBUG_H

include/utils/TextOutput.h→include/binder/TextOutput.h

+0 −0

File moved.

View file