summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-05-31 19:13:00 -0700
committerMathias Agopian <mathias@google.com>2009-05-31 19:13:00 -0700
commit3b4062eeb01be33951ba214e027da523cf09f8b1 (patch)
treeee621c2fa8a23e61e41626c7bcf79884f0d7555e /tools
parentabe00fdee08577eb0fa2e5d220e91317b8f883a8 (diff)
downloadframeworks_base-3b4062eeb01be33951ba214e027da523cf09f8b1.zip
frameworks_base-3b4062eeb01be33951ba214e027da523cf09f8b1.tar.gz
frameworks_base-3b4062eeb01be33951ba214e027da523cf09f8b1.tar.bz2
get rid of utils.h
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/Bundle.h5
-rw-r--r--tools/aapt/Command.cpp5
-rw-r--r--tools/aapt/Main.cpp5
-rw-r--r--tools/aapt/Main.h5
-rw-r--r--tools/aapt/Package.cpp5
5 files changed, 20 insertions, 5 deletions
diff --git a/tools/aapt/Bundle.h b/tools/aapt/Bundle.h
index 2eb7a1d..9e712b8 100644
--- a/tools/aapt/Bundle.h
+++ b/tools/aapt/Bundle.h
@@ -7,7 +7,10 @@
#define __BUNDLE_H
#include <stdlib.h>
-#include <utils.h> // android
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>
#include <utils/String8.h>
#include <utils/Vector.h>
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index dc91a48..32df631 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -8,7 +8,10 @@
#include "ResourceTable.h"
#include "XMLNode.h"
-#include <utils.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>
#include <utils/ZipFile.h>
#include <fcntl.h>
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index 8bf2b07..6ff8269 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -6,7 +6,10 @@
#include "Main.h"
#include "Bundle.h"
-#include <utils.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>
#include <utils/ZipFile.h>
#include <stdlib.h>
diff --git a/tools/aapt/Main.h b/tools/aapt/Main.h
index 65c0a8a..b5c334c 100644
--- a/tools/aapt/Main.h
+++ b/tools/aapt/Main.h
@@ -6,7 +6,10 @@
#ifndef __MAIN_H
#define __MAIN_H
-#include <utils.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>
#include "Bundle.h"
#include "AaptAssets.h"
#include <utils/ZipFile.h>
diff --git a/tools/aapt/Package.cpp b/tools/aapt/Package.cpp
index eb7d6f5..8900529 100644
--- a/tools/aapt/Package.cpp
+++ b/tools/aapt/Package.cpp
@@ -7,7 +7,10 @@
#include "AaptAssets.h"
#include "ResourceTable.h"
-#include <utils.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>
#include <utils/ZipFile.h>
#include <sys/types.h>