get rid of utils.h

diff --git a/Bundle.h b/Bundle.h
index 2eb7a1ddda9afef5acb75dd2420a8ca83da4a341..9e712b8883918a56c1d266954a906bf9e88fc28c 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -7,7 +7,10 @@
 #define __BUNDLE_H
 
 #include <stdlib.h>
 #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>
 
 #include <utils/String8.h>
 #include <utils/Vector.h>
 

diff --git a/Command.cpp b/Command.cpp
index dc91a48ce24e1eb76149aef578d6e9ec5e8665f4..32df6317e2884973ab362e230d54e4b779c3ed23 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -8,7 +8,10 @@
 #include "ResourceTable.h"
 #include "XMLNode.h"
 
 #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>
 #include <utils/ZipFile.h>
 
 #include <fcntl.h>

diff --git a/Main.cpp b/Main.cpp
index 8bf2b075e6fe4d2250a55244c7375d069388e223..6ff82690105d8876261418d6e740f775515f5f51 100644 (file)
--- a/Main.cpp
+++ b/Main.cpp
@@ -6,7 +6,10 @@
 #include "Main.h"
 #include "Bundle.h"
 
 #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>
 #include <utils/ZipFile.h>
 
 #include <stdlib.h>

diff --git a/Main.h b/Main.h
index 65c0a8a91dee3f90f8c05de284542c6601a7ae19..b5c334c7700adb90a7c4811ece8feb8484117d55 100644 (file)
--- a/Main.h
+++ b/Main.h
@@ -6,7 +6,10 @@
 #ifndef __MAIN_H
 #define __MAIN_H
 
 #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>
 #include "Bundle.h"
 #include "AaptAssets.h"
 #include <utils/ZipFile.h>

diff --git a/Package.cpp b/Package.cpp
index eb7d6f559ecb3d62dbaaeb0752a5f5b308052946..890052972d9df444c2227a7ee7651f707c39d403 100644 (file)
--- a/Package.cpp
+++ b/Package.cpp
@@ -7,7 +7,10 @@
 #include "AaptAssets.h"
 #include "ResourceTable.h"
 
 #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>
 #include <utils/ZipFile.h>
 
 #include <sys/types.h>