diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-31 22:44:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-31 22:44:44 -0700 |
| commit | ad736fb1658b2a96530c518ade7cf44ee6f088f9 (patch) | |
| tree | e3e672f4f4fdd72b465cc0f39fb95c7711814122 | |
| parent | 483470d467fb376f59ac46a87d25ace332667798 (diff) | |
| parent | e0c322049ab2be291c1fc40f79702543d4e77934 (diff) | |
| download | frameworks_native-ad736fb1658b2a96530c518ade7cf44ee6f088f9.zip frameworks_native-ad736fb1658b2a96530c518ade7cf44ee6f088f9.tar.gz frameworks_native-ad736fb1658b2a96530c518ade7cf44ee6f088f9.tar.bz2 | |
Merge change 2792
* changes:
get rid of utils.h
| -rw-r--r-- | cmds/runtime/main_runtime.cpp | 4 | ||||
| -rw-r--r-- | include/ui/EventHub.h | 5 | ||||
| -rw-r--r-- | include/utils.h | 33 | ||||
| -rw-r--r-- | include/utils/misc.h | 2 | ||||
| -rw-r--r-- | libs/ui/EventHub.cpp | 4 |
5 files changed, 11 insertions, 37 deletions
diff --git a/cmds/runtime/main_runtime.cpp b/cmds/runtime/main_runtime.cpp index 6ae3a5c..21e0e4d 100644 --- a/cmds/runtime/main_runtime.cpp +++ b/cmds/runtime/main_runtime.cpp @@ -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> diff --git a/include/ui/EventHub.h b/include/ui/EventHub.h index 3848d8c..e12c4f1 100644 --- a/include/ui/EventHub.h +++ b/include/ui/EventHub.h @@ -20,7 +20,10 @@ #include <utils/String8.h> #include <utils/threads.h> -#include <utils.h> +#include <utils/Log.h> +#include <utils/threads.h> +#include <utils/List.h> +#include <utils/Errors.h> #include <linux/input.h> diff --git a/include/utils.h b/include/utils.h deleted file mode 100644 index 30648b1..0000000 --- a/include/utils.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 diff --git a/include/utils/misc.h b/include/utils/misc.h index 62e84b4..23f2a4c 100644 --- a/include/utils/misc.h +++ b/include/utils/misc.h @@ -21,7 +21,7 @@ #define _LIBS_UTILS_MISC_H #include <sys/time.h> -#include "utils/Endian.h" +#include <utils/Endian.h> namespace android { diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp index 52aa0c0..13c30a7 100644 --- a/libs/ui/EventHub.cpp +++ b/libs/ui/EventHub.cpp @@ -21,7 +21,9 @@ #include <cutils/properties.h> #include <utils/Log.h> #include <utils/Timers.h> -#include <utils.h> +#include <utils/threads.h> +#include <utils/List.h> +#include <utils/Errors.h> #include <stdlib.h> #include <stdio.h> |