Moved headers from include/libcutils and include/liblog to libcutils/include and liblog/include respectively, so they can be exported via these libs. They needed to be moved since Soong does not allow export from external folder. Added symlink from old locations. They are needed since Soong includes system/core/include by default. Once all modules are cleaned up to explicitly add the required libs, the symlinks will be removed. Also added liblog_vndk_headers that exports a special log/log.h for VNDK. Moved headers of libcutils to libcutils_headers. They should be used by modules for header-only inlines. Added libcutils_headers as dependency of libcutils. Added libcutils_vndk_headers that exports a special cutils/log.h deprecating usage of the file. A later CL will deprecate the one in libcutils_headers Test: Add above libs to shared lib of local module Change-Id: I6e1f9c5f23d8b6eae13dc3b7e5dfe7fae93b8510
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2006 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.
|
|
*/
|
|
|
|
#ifndef __CUTILS_STRING16_H
|
|
#define __CUTILS_STRING16_H
|
|
|
|
#include <stdint.h>
|
|
#include <stddef.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#if __STDC_VERSION__ < 201112L && __cplusplus < 201103L
|
|
typedef uint16_t char16_t;
|
|
#endif
|
|
// otherwise char16_t is a keyword with the right semantics
|
|
|
|
extern char * strndup16to8 (const char16_t* s, size_t n);
|
|
extern size_t strnlen16to8 (const char16_t* s, size_t n);
|
|
extern char * strncpy16to8 (char *dest, const char16_t*s, size_t n);
|
|
|
|
extern char16_t * strdup8to16 (const char* s, size_t *out_len);
|
|
extern size_t strlen8to16 (const char* utf8Str);
|
|
extern char16_t * strcpy8to16 (char16_t *dest, const char*s, size_t *out_len);
|
|
extern char16_t * strcpylen8to16 (char16_t *dest, const char*s, int length,
|
|
size_t *out_len);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* __CUTILS_STRING16_H */
|