| commit | b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri Feb 17 18:27:36 2012 -0800 |
| committer | Mathias Agopian <mathias@google.com> | Fri Feb 17 19:01:26 2012 -0800 |
| tree | 2b90dc39a35d8081ea47b038893624b69a01202d | |
| parent | 6db0608dff408130b35e6f21abe746a635648b18 [diff] |
frameworks/base refactoring. step 2: move libutils headers to their new home: androidfw Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
diff --git a/include/android_runtime/android_content_res_Configuration.h b/include/android_runtime/android_content_res_Configuration.h index 2f5a982..34c4439 100644 --- a/include/android_runtime/android_content_res_Configuration.h +++ b/include/android_runtime/android_content_res_Configuration.h
@@ -17,7 +17,7 @@ #ifndef _ANDROID_CONTENT_RES_CONFIGURATION_H #define _ANDROID_CONTENT_RES_CONFIGURATION_H -#include <utils/ResourceTypes.h> +#include <androidfw/ResourceTypes.h> #include <android/configuration.h> #include "jni.h"
diff --git a/include/android_runtime/android_util_AssetManager.h b/include/android_runtime/android_util_AssetManager.h index b6dd9c9..8dd9337 100644 --- a/include/android_runtime/android_util_AssetManager.h +++ b/include/android_runtime/android_util_AssetManager.h
@@ -17,7 +17,7 @@ #ifndef android_util_AssetManager_H #define android_util_AssetManager_H -#include <utils/AssetManager.h> +#include <androidfw/AssetManager.h> #include "jni.h"
diff --git a/include/utils/Asset.h b/include/androidfw/Asset.h similarity index 100% rename from include/utils/Asset.h rename to include/androidfw/Asset.h
diff --git a/include/utils/AssetDir.h b/include/androidfw/AssetDir.h similarity index 100% rename from include/utils/AssetDir.h rename to include/androidfw/AssetDir.h
diff --git a/include/utils/AssetManager.h b/include/androidfw/AssetManager.h similarity index 98% rename from include/utils/AssetManager.h rename to include/androidfw/AssetManager.h index a8c7ddb..d95b45e 100644 --- a/include/utils/AssetManager.h +++ b/include/androidfw/AssetManager.h
@@ -20,14 +20,15 @@ #ifndef __LIBS_ASSETMANAGER_H #define __LIBS_ASSETMANAGER_H -#include <utils/Asset.h> -#include <utils/AssetDir.h> +#include <androidfw/Asset.h> +#include <androidfw/AssetDir.h> +#include <androidfw/ZipFileRO.h> #include <utils/KeyedVector.h> -#include <utils/String8.h> -#include <utils/Vector.h> +#include <utils/SortedVector.h> #include <utils/String16.h> -#include <utils/ZipFileRO.h> +#include <utils/String8.h> #include <utils/threads.h> +#include <utils/Vector.h> /* * Native-app access is via the opaque typedef struct AAssetManager in the C namespace.
diff --git a/include/utils/BackupHelpers.h b/include/androidfw/BackupHelpers.h similarity index 100% rename from include/utils/BackupHelpers.h rename to include/androidfw/BackupHelpers.h
diff --git a/include/utils/ObbFile.h b/include/androidfw/ObbFile.h similarity index 100% rename from include/utils/ObbFile.h rename to include/androidfw/ObbFile.h
diff --git a/include/utils/ResourceTypes.h b/include/androidfw/ResourceTypes.h similarity index 99% rename from include/utils/ResourceTypes.h rename to include/androidfw/ResourceTypes.h index c496da6..23bca3e 100644 --- a/include/utils/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h
@@ -20,7 +20,7 @@ #ifndef _LIBS_UTILS_RESOURCE_TYPES_H #define _LIBS_UTILS_RESOURCE_TYPES_H -#include <utils/Asset.h> +#include <androidfw/Asset.h> #include <utils/ByteOrder.h> #include <utils/Errors.h> #include <utils/String16.h>
diff --git a/include/utils/StreamingZipInflater.h b/include/androidfw/StreamingZipInflater.h similarity index 100% rename from include/utils/StreamingZipInflater.h rename to include/androidfw/StreamingZipInflater.h
diff --git a/include/utils/ZipFileCRO.h b/include/androidfw/ZipFileCRO.h similarity index 100% rename from include/utils/ZipFileCRO.h rename to include/androidfw/ZipFileCRO.h
diff --git a/include/utils/ZipFileRO.h b/include/androidfw/ZipFileRO.h similarity index 100% rename from include/utils/ZipFileRO.h rename to include/androidfw/ZipFileRO.h
diff --git a/include/utils/ZipUtils.h b/include/androidfw/ZipUtils.h similarity index 100% rename from include/utils/ZipUtils.h rename to include/androidfw/ZipUtils.h