From 79e5d3720a77ba0283068f5a9f2fef5c6517e4be Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Sun, 31 May 2009 19:13:00 -0700
Subject: [PATCH] get rid of utils.h

---
 Bundle.h    | 5 ++++-
 Command.cpp | 5 ++++-
 Main.cpp    | 5 ++++-
 Main.h      | 5 ++++-
 Package.cpp | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Bundle.h b/Bundle.h
index 2eb7a1d..9e712b8 100644
--- a/Bundle.h
+++ b/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/Command.cpp b/Command.cpp
index dc91a48..32df631 100644
--- a/Command.cpp
+++ b/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/Main.cpp b/Main.cpp
index 8bf2b07..6ff8269 100644
--- a/Main.cpp
+++ b/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/Main.h b/Main.h
index 65c0a8a..b5c334c 100644
--- a/Main.h
+++ b/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/Package.cpp b/Package.cpp
index eb7d6f5..8900529 100644
--- a/Package.cpp
+++ b/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>
-- 
2.45.2