diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-04 22:44:18 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-04 22:44:18 -0700 |
commit | 1b6aee15157f0236ac1fc7885735609bf27171d3 (patch) | |
tree | d26d76ee11b8c0300e977627196265961dbd03c0 /libs/utils | |
parent | f43572978783aacc1babade274992cb171d1c1f0 (diff) | |
parent | 2a3188672ab2b65c0ce7c9c598a463e382c47696 (diff) | |
download | frameworks_base-1b6aee15157f0236ac1fc7885735609bf27171d3.zip frameworks_base-1b6aee15157f0236ac1fc7885735609bf27171d3.tar.gz frameworks_base-1b6aee15157f0236ac1fc7885735609bf27171d3.tar.bz2 |
am 2a318867: Merge change 3203 into donut
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'
* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
rename a few files to camel-case, add copyright notices
Diffstat (limited to 'libs/utils')
-rw-r--r-- | libs/utils/Android.mk | 4 | ||||
-rw-r--r-- | libs/utils/BackupData.cpp (renamed from libs/utils/backup_data.cpp) | 2 | ||||
-rw-r--r-- | libs/utils/BackupHelpers.cpp (renamed from libs/utils/backup_helper_file.cpp) | 2 | ||||
-rw-r--r-- | libs/utils/CharacterData.h (renamed from libs/utils/characterData.h) | 0 | ||||
-rw-r--r-- | libs/utils/Unicode.cpp | 6 | ||||
-rw-r--r-- | libs/utils/ZipEntry.cpp | 4 | ||||
-rw-r--r-- | libs/utils/ZipFile.cpp | 6 | ||||
-rw-r--r-- | libs/utils/ZipFileCRO.cpp | 4 | ||||
-rw-r--r-- | libs/utils/ZipFileRO.cpp | 6 | ||||
-rw-r--r-- | libs/utils/ZipUtils.cpp | 6 |
10 files changed, 20 insertions, 20 deletions
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index 1acc1a4..0b4c95b 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk @@ -96,8 +96,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ $(commonSources) \ Unicode.cpp \ - backup_data.cpp \ - backup_helper_file.cpp + BackupData.cpp \ + BackupHelpers.cpp ifeq ($(TARGET_SIMULATOR),true) LOCAL_SRC_FILES += $(hostSources) diff --git a/libs/utils/backup_data.cpp b/libs/utils/BackupData.cpp index 95c05b7..120f23d 100644 --- a/libs/utils/backup_data.cpp +++ b/libs/utils/BackupData.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "backup_data" -#include <utils/backup_helpers.h> +#include <utils/BackupHelpers.h> #include <utils/ByteOrder.h> #include <stdio.h> diff --git a/libs/utils/backup_helper_file.cpp b/libs/utils/BackupHelpers.cpp index 7ec2ce8..e8e6c45 100644 --- a/libs/utils/backup_helper_file.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "file_backup_helper" -#include <utils/backup_helpers.h> +#include <utils/BackupHelpers.h> #include <utils/KeyedVector.h> #include <utils/ByteOrder.h> diff --git a/libs/utils/characterData.h b/libs/utils/CharacterData.h index e931d99..e931d99 100644 --- a/libs/utils/characterData.h +++ b/libs/utils/CharacterData.h diff --git a/libs/utils/Unicode.cpp b/libs/utils/Unicode.cpp index 33f535f..f92703e 100644 --- a/libs/utils/Unicode.cpp +++ b/libs/utils/Unicode.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "utils/AndroidUnicode.h" -#include "characterData.h" +#include <utils/AndroidUnicode.h> +#include "CharacterData.h" #define LOG_TAG "Unicode" -#include "utils/Log.h" +#include <utils/Log.h> // ICU headers for using macros #include <unicode/utf16.h> diff --git a/libs/utils/ZipEntry.cpp b/libs/utils/ZipEntry.cpp index fbc9e67..96f9fc4 100644 --- a/libs/utils/ZipEntry.cpp +++ b/libs/utils/ZipEntry.cpp @@ -20,8 +20,8 @@ #define LOG_TAG "zip" -#include "utils/ZipEntry.h" -#include "utils/Log.h" +#include <utils/ZipEntry.h> +#include <utils/Log.h> #include <stdio.h> #include <string.h> diff --git a/libs/utils/ZipFile.cpp b/libs/utils/ZipFile.cpp index 2132d22..eaa0b20 100644 --- a/libs/utils/ZipFile.cpp +++ b/libs/utils/ZipFile.cpp @@ -20,9 +20,9 @@ #define LOG_TAG "zip" -#include "utils/ZipFile.h" -#include "utils/ZipUtils.h" -#include "utils/Log.h" +#include <utils/ZipFile.h> +#include <utils/ZipUtils.h> +#include <utils/Log.h> #include <zlib.h> #define DEF_MEM_LEVEL 8 // normally in zutil.h? diff --git a/libs/utils/ZipFileCRO.cpp b/libs/utils/ZipFileCRO.cpp index d312daf..45f6c8b 100644 --- a/libs/utils/ZipFileCRO.cpp +++ b/libs/utils/ZipFileCRO.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "utils/ZipFileCRO.h" -#include "utils/ZipFileRO.h" +#include <utils/ZipFileCRO.h> +#include <utils/ZipFileRO.h> using namespace android; diff --git a/libs/utils/ZipFileRO.cpp b/libs/utils/ZipFileRO.cpp index ae8c719..6c701dd 100644 --- a/libs/utils/ZipFileRO.cpp +++ b/libs/utils/ZipFileRO.cpp @@ -19,9 +19,9 @@ // #define LOG_TAG "zipro" //#define LOG_NDEBUG 0 -#include "utils/ZipFileRO.h" -#include "utils/Log.h" -#include "utils/misc.h" +#include <utils/ZipFileRO.h> +#include <utils/Log.h> +#include <utils/misc.h> #include <zlib.h> diff --git a/libs/utils/ZipUtils.cpp b/libs/utils/ZipUtils.cpp index bfbacfe..5df94cb 100644 --- a/libs/utils/ZipUtils.cpp +++ b/libs/utils/ZipUtils.cpp @@ -20,9 +20,9 @@ #define LOG_TAG "ziputil" -#include "utils/ZipUtils.h" -#include "utils/ZipFileRO.h" -#include "utils/Log.h" +#include <utils/ZipUtils.h> +#include <utils/ZipFileRO.h> +#include <utils/Log.h> #include <stdlib.h> #include <string.h> |