From 608222fa02a32eb94518160b9440276d69a5a13b Mon Sep 17 00:00:00 2001 From: Nikhil Punathil Date: Tue, 22 Aug 2017 00:31:17 +0530 Subject: shinano-common: Move common shims to msm8974-common Change-Id: Id79c5db191011fbb93a5ad6c4a9b58653bf79ba2 Signed-off-by: Nikhil Punathil --- libshims/Android.mk | 15 ------ libshims/idd.c | 22 -------- libshims/signal.c | 22 -------- libshims/signal.h | 145 ---------------------------------------------------- 4 files changed, 204 deletions(-) delete mode 100644 libshims/idd.c delete mode 100644 libshims/signal.c delete mode 100644 libshims/signal.h (limited to 'libshims') diff --git a/libshims/Android.mk b/libshims/Android.mk index 5d4e445..62315cb 100644 --- a/libshims/Android.mk +++ b/libshims/Android.mk @@ -15,21 +15,6 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := signal.c -LOCAL_MODULE := libshims_signal -LOCAL_SHARED_LIBRARIES := libc -LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := idd.c -LOCAL_MODULE := libshims_idd -LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true -include $(BUILD_SHARED_LIBRARY) - include $(CLEAR_VARS) LOCAL_SRC_FILES := libsonycamera.cpp LOCAL_MODULE := libsonycamera diff --git a/libshims/idd.c b/libshims/idd.c deleted file mode 100644 index fe6d4f7..0000000 --- a/libshims/idd.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2017 The LineageOS 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 - -int getdtablesize(void) { - return 1024; -} diff --git a/libshims/signal.c b/libshims/signal.c deleted file mode 100644 index a3dcb9a..0000000 --- a/libshims/signal.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2017 The LineageOS 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 "signal.h" - -sighandler_t bsd_signal(int signum, sighandler_t handler) { - return signal(signum, handler); -} - diff --git a/libshims/signal.h b/libshims/signal.h deleted file mode 100644 index 85c46c0..0000000 --- a/libshims/signal.h +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _SIGNAL_H_ -#define _SIGNAL_H_ - -#include -#include -#include -#include -#include -#include - -#if defined(__LP64__) || defined(__mips__) -/* For 64-bit (and mips), the kernel's struct sigaction doesn't match the POSIX one, - * so we need to expose our own and translate behind the scenes. */ -# define sigaction __kernel_sigaction -# include -# undef sigaction -#else -/* For 32-bit, we're stuck with the definitions we already shipped, - * even though they contain a sigset_t that's too small. */ -# include -#endif - -#include -#define __BIONIC_HAVE_UCONTEXT_T - -__BEGIN_DECLS - -typedef int sig_atomic_t; - -/* The arm and x86 kernel header files don't define _NSIG. */ -#ifndef _KERNEL__NSIG -#define _KERNEL__NSIG 64 -#endif - -/* Userspace's NSIG is the kernel's _NSIG + 1. */ -#define _NSIG (_KERNEL__NSIG + 1) -#define NSIG _NSIG - -/* We take a few real-time signals for ourselves. May as well use the same names as glibc. */ -#define SIGRTMIN (__libc_current_sigrtmin()) -#define SIGRTMAX (__libc_current_sigrtmax()) -extern int __libc_current_sigrtmin(void); -extern int __libc_current_sigrtmax(void); - -extern const char* const sys_siglist[]; -extern const char* const sys_signame[]; /* BSD compatibility. */ - -typedef __sighandler_t sig_t; /* BSD compatibility. */ -typedef __sighandler_t sighandler_t; /* glibc compatibility. */ - -#define si_timerid si_tid /* glibc compatibility. */ - -#if defined(__LP64__) - -struct sigaction { - unsigned int sa_flags; - union { - sighandler_t sa_handler; - void (*sa_sigaction)(int, struct siginfo*, void*); - }; - sigset_t sa_mask; - void (*sa_restorer)(void); -}; - -#elif defined(__mips__) - -struct sigaction { - unsigned int sa_flags; - union { - sighandler_t sa_handler; - void (*sa_sigaction) (int, struct siginfo*, void*); - }; - sigset_t sa_mask; -}; - -#endif - -extern int sigaction(int, const struct sigaction*, struct sigaction*); - -extern sighandler_t signal(int, sighandler_t) __INTRODUCED_IN(21); - -extern int siginterrupt(int, int); - -extern int sigaddset(sigset_t*, int) __INTRODUCED_IN(21); -extern int sigdelset(sigset_t*, int) __INTRODUCED_IN(21); -extern int sigemptyset(sigset_t*) __INTRODUCED_IN(21); -extern int sigfillset(sigset_t*) __INTRODUCED_IN(21); -extern int sigismember(const sigset_t*, int) __INTRODUCED_IN(21); - -extern int sigpending(sigset_t*) __nonnull((1)); -extern int sigprocmask(int, const sigset_t*, sigset_t*); -extern int sigsuspend(const sigset_t*) __nonnull((1)); -extern int sigwait(const sigset_t*, int*) __nonnull((1, 2)); - -extern int raise(int); -extern int kill(pid_t, int); -extern int killpg(int, int); - -extern int sigaltstack(const stack_t*, stack_t*); - -extern void psiginfo(const siginfo_t*, const char*); -extern void psignal(int, const char*); - -extern int pthread_kill(pthread_t, int); -extern int pthread_sigmask(int, const sigset_t*, sigset_t*); - -extern int sigqueue(pid_t, int, const union sigval); -extern int sigtimedwait(const sigset_t*, siginfo_t*, const struct timespec*); -extern int sigwaitinfo(const sigset_t*, siginfo_t*); - -#if __ANDROID_API__ < 21 -#include -#endif - -__END_DECLS - -#endif /* _SIGNAL_H_ */ -- cgit v1.2.3