Merge change 2792 (ad736fb1) · Commits · e / os / platform_frameworks_native

cmds/runtime/main_runtime.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,9 @@
		#include "ServiceManager.h"
		#include "SignalHandler.h"

		#include <utils.h>
		#include <utils/threads.h>
		#include <utils/Errors.h>

		#include <binder/IPCThreadState.h>
		#include <binder/ProcessState.h>
		#include <utils/Log.h>

+4 −1

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* 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.
		* 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.
		*/

		//
		// Handy utility functions and portability code. This file includes all
		// of the generally-useful headers in the "utils" directory.
		//
		#ifndef _LIBS_UTILS_H
		#define _LIBS_UTILS_H

		#include <utils/ported.h>
		#include <utils/Log.h>
		#include <utils/threads.h>
		#include <utils/Timers.h>
		#include <utils/List.h>
		#include <utils/string_array.h>
		#include <utils/misc.h>
		#include <utils/Errors.h>

		#endif // _LIBS_UTILS_H

+1 −1

+3 −1