diff --git a/cmds/backup/backup.cpp b/cmds/backup/backup.cpp index 51ac9431fb96c..22dd486ad9959 100644 --- a/cmds/backup/backup.cpp +++ b/cmds/backup/backup.cpp @@ -1,5 +1,20 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -#include +#include #include #include diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp index 8fce2a20794cb..aab123331452b 100644 --- a/core/jni/android_backup_BackupDataOutput.cpp +++ b/core/jni/android_backup_BackupDataOutput.cpp @@ -20,7 +20,7 @@ #include "JNIHelp.h" #include -#include +#include namespace android { diff --git a/core/jni/android_backup_FileBackupHelper.cpp b/core/jni/android_backup_FileBackupHelper.cpp index a05d812307c8f..a46f37baefb57 100644 --- a/core/jni/android_backup_FileBackupHelper.cpp +++ b/core/jni/android_backup_FileBackupHelper.cpp @@ -20,7 +20,7 @@ #include "JNIHelp.h" #include -#include +#include namespace android { diff --git a/include/utils/backup_helpers.h b/include/utils/BackupHelpers.h similarity index 100% rename from include/utils/backup_helpers.h rename to include/utils/BackupHelpers.h diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index 5a1a89b46e30b..9bdd64adeeb00 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk @@ -117,8 +117,8 @@ LOCAL_SRC_FILES:= \ IPermissionController.cpp \ IServiceManager.cpp \ 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 similarity index 99% rename from libs/utils/backup_data.cpp rename to libs/utils/BackupData.cpp index 95c05b7edbd18..120f23d3628e0 100644 --- a/libs/utils/backup_data.cpp +++ b/libs/utils/BackupData.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "backup_data" -#include +#include #include #include diff --git a/libs/utils/backup_helper_file.cpp b/libs/utils/BackupHelpers.cpp similarity index 99% rename from libs/utils/backup_helper_file.cpp rename to libs/utils/BackupHelpers.cpp index 7ec2ce8653d94..e8e6c45725ffd 100644 --- a/libs/utils/backup_helper_file.cpp +++ b/libs/utils/BackupHelpers.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "file_backup_helper" -#include +#include #include #include diff --git a/libs/utils/characterData.h b/libs/utils/CharacterData.h similarity index 100% rename from libs/utils/characterData.h rename to libs/utils/CharacterData.h diff --git a/libs/utils/Unicode.cpp b/libs/utils/Unicode.cpp index 33f535fd1a7ca..f92703e7f0e8e 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 +#include "CharacterData.h" #define LOG_TAG "Unicode" -#include "utils/Log.h" +#include // ICU headers for using macros #include diff --git a/libs/utils/ZipEntry.cpp b/libs/utils/ZipEntry.cpp index fbc9e67843f1b..96f9fc4d692f5 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 +#include #include #include diff --git a/libs/utils/ZipFile.cpp b/libs/utils/ZipFile.cpp index 89aa874b4941b..6f27d17f07f1f 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 +#include +#include #include #define DEF_MEM_LEVEL 8 // normally in zutil.h? diff --git a/libs/utils/ZipFileCRO.cpp b/libs/utils/ZipFileCRO.cpp index d312dafada722..45f6c8baa7077 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 +#include using namespace android; diff --git a/libs/utils/ZipFileRO.cpp b/libs/utils/ZipFileRO.cpp index ae8c719726d27..6c701dd0b6734 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 +#include +#include #include diff --git a/libs/utils/ZipUtils.cpp b/libs/utils/ZipUtils.cpp index bfbacfecd9929..5df94cbbd9a00 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 +#include +#include #include #include diff --git a/tests/backup/backup_helper_test.cpp b/tests/backup/backup_helper_test.cpp index 108590931473a..f08794184a9fc 100644 --- a/tests/backup/backup_helper_test.cpp +++ b/tests/backup/backup_helper_test.cpp @@ -1,4 +1,20 @@ -#include +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include #include #include