Merge change 3203 into donut
* changes: rename a few files to camel-case, add copyright notices
This commit is contained in:
@ -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 <utils/backup_helpers.h>
|
#include <utils/BackupHelpers.h>
|
||||||
#include <utils/String8.h>
|
#include <utils/String8.h>
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include "JNIHelp.h"
|
#include "JNIHelp.h"
|
||||||
#include <android_runtime/AndroidRuntime.h>
|
#include <android_runtime/AndroidRuntime.h>
|
||||||
|
|
||||||
#include <utils/backup_helpers.h>
|
#include <utils/BackupHelpers.h>
|
||||||
|
|
||||||
namespace android
|
namespace android
|
||||||
{
|
{
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include "JNIHelp.h"
|
#include "JNIHelp.h"
|
||||||
#include <android_runtime/AndroidRuntime.h>
|
#include <android_runtime/AndroidRuntime.h>
|
||||||
|
|
||||||
#include <utils/backup_helpers.h>
|
#include <utils/BackupHelpers.h>
|
||||||
|
|
||||||
namespace android
|
namespace android
|
||||||
{
|
{
|
||||||
|
@ -117,8 +117,8 @@ LOCAL_SRC_FILES:= \
|
|||||||
IPermissionController.cpp \
|
IPermissionController.cpp \
|
||||||
IServiceManager.cpp \
|
IServiceManager.cpp \
|
||||||
Unicode.cpp \
|
Unicode.cpp \
|
||||||
backup_data.cpp \
|
BackupData.cpp \
|
||||||
backup_helper_file.cpp
|
BackupHelpers.cpp
|
||||||
|
|
||||||
ifeq ($(TARGET_SIMULATOR),true)
|
ifeq ($(TARGET_SIMULATOR),true)
|
||||||
LOCAL_SRC_FILES += $(hostSources)
|
LOCAL_SRC_FILES += $(hostSources)
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#define LOG_TAG "backup_data"
|
#define LOG_TAG "backup_data"
|
||||||
|
|
||||||
#include <utils/backup_helpers.h>
|
#include <utils/BackupHelpers.h>
|
||||||
#include <utils/ByteOrder.h>
|
#include <utils/ByteOrder.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#define LOG_TAG "file_backup_helper"
|
#define LOG_TAG "file_backup_helper"
|
||||||
|
|
||||||
#include <utils/backup_helpers.h>
|
#include <utils/BackupHelpers.h>
|
||||||
|
|
||||||
#include <utils/KeyedVector.h>
|
#include <utils/KeyedVector.h>
|
||||||
#include <utils/ByteOrder.h>
|
#include <utils/ByteOrder.h>
|
@ -14,11 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "utils/AndroidUnicode.h"
|
#include <utils/AndroidUnicode.h>
|
||||||
#include "characterData.h"
|
#include "CharacterData.h"
|
||||||
|
|
||||||
#define LOG_TAG "Unicode"
|
#define LOG_TAG "Unicode"
|
||||||
#include "utils/Log.h"
|
#include <utils/Log.h>
|
||||||
|
|
||||||
// ICU headers for using macros
|
// ICU headers for using macros
|
||||||
#include <unicode/utf16.h>
|
#include <unicode/utf16.h>
|
||||||
|
@ -20,8 +20,8 @@
|
|||||||
|
|
||||||
#define LOG_TAG "zip"
|
#define LOG_TAG "zip"
|
||||||
|
|
||||||
#include "utils/ZipEntry.h"
|
#include <utils/ZipEntry.h>
|
||||||
#include "utils/Log.h"
|
#include <utils/Log.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
|
|
||||||
#define LOG_TAG "zip"
|
#define LOG_TAG "zip"
|
||||||
|
|
||||||
#include "utils/ZipFile.h"
|
#include <utils/ZipFile.h>
|
||||||
#include "utils/ZipUtils.h"
|
#include <utils/ZipUtils.h>
|
||||||
#include "utils/Log.h"
|
#include <utils/Log.h>
|
||||||
|
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
#define DEF_MEM_LEVEL 8 // normally in zutil.h?
|
#define DEF_MEM_LEVEL 8 // normally in zutil.h?
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "utils/ZipFileCRO.h"
|
#include <utils/ZipFileCRO.h>
|
||||||
#include "utils/ZipFileRO.h"
|
#include <utils/ZipFileRO.h>
|
||||||
|
|
||||||
using namespace android;
|
using namespace android;
|
||||||
|
|
||||||
|
@ -19,9 +19,9 @@
|
|||||||
//
|
//
|
||||||
#define LOG_TAG "zipro"
|
#define LOG_TAG "zipro"
|
||||||
//#define LOG_NDEBUG 0
|
//#define LOG_NDEBUG 0
|
||||||
#include "utils/ZipFileRO.h"
|
#include <utils/ZipFileRO.h>
|
||||||
#include "utils/Log.h"
|
#include <utils/Log.h>
|
||||||
#include "utils/misc.h"
|
#include <utils/misc.h>
|
||||||
|
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
|
|
||||||
#define LOG_TAG "ziputil"
|
#define LOG_TAG "ziputil"
|
||||||
|
|
||||||
#include "utils/ZipUtils.h"
|
#include <utils/ZipUtils.h>
|
||||||
#include "utils/ZipFileRO.h"
|
#include <utils/ZipFileRO.h>
|
||||||
#include "utils/Log.h"
|
#include <utils/Log.h>
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -1,4 +1,20 @@
|
|||||||
#include <utils/backup_helpers.h>
|
/*
|
||||||
|
* 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 <utils/BackupHelpers.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
Reference in New Issue
Block a user