Skip to content

[android] Remove dependency from SwiftShims to Libc #26079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2019
Merged

[android] Remove dependency from SwiftShims to Libc #26079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions stdlib/public/SwiftShims/LibcShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
#include "SwiftStddef.h"
#include "Visibility.h"

#if defined(__ANDROID__)
#include <android/api-level.h>
#endif

#if __has_feature(nullability)
#pragma clang assume_nonnull begin
#endif
Expand Down Expand Up @@ -112,7 +108,7 @@ static inline __swift_size_t _swift_stdlib_malloc_size(const void *ptr) {
|| defined(__HAIKU__) || defined(__FreeBSD__)
static inline __swift_size_t _swift_stdlib_malloc_size(const void *ptr) {
#if defined(__ANDROID__)
#if __ANDROID_API__ >= 17
#if !defined(__ANDROID_API__) || __ANDROID_API__ >= 17
extern __swift_size_t malloc_usable_size(const void *ptr);
#endif
#else
Expand Down