diff options
| author | 2012-02-17 18:27:36 -0800 | |
|---|---|---|
| committer | 2012-02-17 19:01:26 -0800 | |
| commit | b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 (patch) | |
| tree | 2b90dc39a35d8081ea47b038893624b69a01202d /include | |
| parent | 6db0608dff408130b35e6f21abe746a635648b18 (diff) | |
frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw
Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
Diffstat (limited to 'include')
| -rw-r--r-- | include/android_runtime/android_content_res_Configuration.h | 2 | ||||
| -rw-r--r-- | include/android_runtime/android_util_AssetManager.h | 2 | ||||
| -rw-r--r-- | include/androidfw/Asset.h (renamed from include/utils/Asset.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/AssetDir.h (renamed from include/utils/AssetDir.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/AssetManager.h (renamed from include/utils/AssetManager.h) | 11 | ||||
| -rw-r--r-- | include/androidfw/BackupHelpers.h (renamed from include/utils/BackupHelpers.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/ObbFile.h (renamed from include/utils/ObbFile.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/ResourceTypes.h (renamed from include/utils/ResourceTypes.h) | 2 | ||||
| -rw-r--r-- | include/androidfw/StreamingZipInflater.h (renamed from include/utils/StreamingZipInflater.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/ZipFileCRO.h (renamed from include/utils/ZipFileCRO.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/ZipFileRO.h (renamed from include/utils/ZipFileRO.h) | 0 | ||||
| -rw-r--r-- | include/androidfw/ZipUtils.h (renamed from include/utils/ZipUtils.h) | 0 |
12 files changed, 9 insertions, 8 deletions
diff --git a/include/android_runtime/android_content_res_Configuration.h b/include/android_runtime/android_content_res_Configuration.h index 2f5a98249cb7..34c4439bbde8 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 b6dd9c9f5d8d..8dd933707a6a 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 index 1fe0e063c886..1fe0e063c886 100644 --- a/include/utils/Asset.h +++ b/include/androidfw/Asset.h diff --git a/include/utils/AssetDir.h b/include/androidfw/AssetDir.h index abf8a3595dfb..abf8a3595dfb 100644 --- a/include/utils/AssetDir.h +++ b/include/androidfw/AssetDir.h diff --git a/include/utils/AssetManager.h b/include/androidfw/AssetManager.h index a8c7ddbd78a6..d95b45e98554 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 index 1bb04a7123a3..1bb04a7123a3 100644 --- a/include/utils/BackupHelpers.h +++ b/include/androidfw/BackupHelpers.h diff --git a/include/utils/ObbFile.h b/include/androidfw/ObbFile.h index 47559cdd0d61..47559cdd0d61 100644 --- a/include/utils/ObbFile.h +++ b/include/androidfw/ObbFile.h diff --git a/include/utils/ResourceTypes.h b/include/androidfw/ResourceTypes.h index c496da6bac56..23bca3e2ad9f 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 index 3ace5d5a83cf..3ace5d5a83cf 100644 --- a/include/utils/StreamingZipInflater.h +++ b/include/androidfw/StreamingZipInflater.h diff --git a/include/utils/ZipFileCRO.h b/include/androidfw/ZipFileCRO.h index 3e42a958bf5f..3e42a958bf5f 100644 --- a/include/utils/ZipFileCRO.h +++ b/include/androidfw/ZipFileCRO.h diff --git a/include/utils/ZipFileRO.h b/include/androidfw/ZipFileRO.h index 547e36a09864..547e36a09864 100644 --- a/include/utils/ZipFileRO.h +++ b/include/androidfw/ZipFileRO.h diff --git a/include/utils/ZipUtils.h b/include/androidfw/ZipUtils.h index 42c42b6c0f54..42c42b6c0f54 100644 --- a/include/utils/ZipUtils.h +++ b/include/androidfw/ZipUtils.h |