diff options
| -rw-r--r-- | libshims/Android.mk | 9 | ||||
| -rw-r--r-- | libshims/signal.c | 22 | ||||
| -rw-r--r-- | libshims/signal.h | 145 | ||||
| -rw-r--r-- | rootdir/init.camera.rc | 2 | ||||
| -rw-r--r-- | shinano.mk | 4 |
5 files changed, 179 insertions, 3 deletions
diff --git a/libshims/Android.mk b/libshims/Android.mk index 542e76d..cb466ba 100644 --- a/libshims/Android.mk +++ b/libshims/Android.mk @@ -27,3 +27,12 @@ LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) + +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) + diff --git a/libshims/signal.c b/libshims/signal.c new file mode 100644 index 0000000..a3dcb9a --- /dev/null +++ b/libshims/signal.c @@ -0,0 +1,22 @@ +/* + * 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 new file mode 100644 index 0000000..85c46c0 --- /dev/null +++ b/libshims/signal.h @@ -0,0 +1,145 @@ +/* + * 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 <asm/sigcontext.h> +#include <bits/pthread_types.h> +#include <bits/timespec.h> +#include <limits.h> +#include <sys/cdefs.h> +#include <sys/types.h> + +#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 <linux/signal.h> +# 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 <linux/signal.h> +#endif + +#include <sys/ucontext.h> +#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 <android/legacy_signal_inlines.h> +#endif + +__END_DECLS + +#endif /* _SIGNAL_H_ */ diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc index ab875ed..c5ea0e4 100644 --- a/rootdir/init.camera.rc +++ b/rootdir/init.camera.rc @@ -17,7 +17,7 @@ on init - export LD_SHIM_LIBS /system/vendor/lib/libwvm.so|libshims_wvm.so + export LD_SHIM_LIBS /system/vendor/lib/libwvm.so|libshims_wvm.so:/system/bin/credmgrd|libshims_signal.so mkdir /idd 0751 idd idd mkdir /rca 0750 idd idd @@ -49,10 +49,10 @@ PRODUCT_COPY_FILES += \ # Camera (stock .575 blobs) PRODUCT_PACKAGES += \ - libc_ndk \ tad_static \ wait4tad_static \ - libshims_wvm + libshims_wvm \ + libshims_signal # ANT+ PRODUCT_PACKAGES += \ |