forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions
pmaports/hybris/libhybris/0001-Make-libhybris-compile-with-musl.patch

699 lines
22 KiB
Diff
Raw Normal View History

hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
From eb4efbb1320271a74cb1ee01dcdce3c088ce5abe Mon Sep 17 00:00:00 2001
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
From: NeKit <nekit1000@gmail.com>
Date: Wed, 1 Nov 2017 15:39:45 +0300
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
Subject: [PATCH 1/2] Make libhybris compile with musl
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
Hooks for some functions had to be disabled due to musl not having/exposing
them, which might lead to problems depending on how musl/bionic are
(in)compatible.
---
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
hybris/common/hooks.c | 44 +++++++++++++++++++
hybris/common/hooks_shm.c | 4 ++
hybris/common/jb/dlfcn.c | 4 ++
hybris/common/legacy_properties/properties.c | 3 ++
hybris/common/mm/bionic/libc/include/link.h | 1 +
.../mm/bionic/libc/private/libc_logging.h | 13 ++++++
hybris/common/mm/dlfcn.cpp | 4 ++
hybris/common/mm/hybris_compat.h | 11 +++++
hybris/common/mm/linker.cpp | 11 +++++
hybris/common/n/bionic/libc/include/dlfcn.h | 4 +-
hybris/common/n/bionic/libc/include/link.h | 1 +
.../n/bionic/libc/private/libc_logging.h | 15 ++++++-
hybris/common/n/dlfcn.cpp | 4 ++
hybris/common/n/hybris_compat.cpp | 8 ++++
hybris/common/n/hybris_compat.h | 22 ++++++++++
hybris/common/o/bionic/libc/include/dlfcn.h | 8 ++--
hybris/common/o/dlfcn.cpp | 4 ++
hybris/common/o/hybris_compat.cpp | 8 ++++
hybris/common/o/hybris_compat.h | 22 ++++++++++
hybris/include/hybris/common/musl_compat.h | 10 +++++
hybris/libsync/sync.c | 1 +
hybris/tests/test_camera.c | 4 ++
22 files changed, 199 insertions(+), 7 deletions(-)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
create mode 100644 hybris/include/hybris/common/musl_compat.h
diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
index 03b29d4..2a3a20b 100644
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -80,6 +80,10 @@ extern int my_property_list(void (*propfn)(const char *key, const char *value, v
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
#include <hybris/common/hooks.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
+
#include <android-config.h>
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
// this is also used in bionic:
@@ -531,6 +535,7 @@ static int _hybris_hook_pthread_attr_getstacksize(pthread_attr_t const *__attr,
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return pthread_attr_getstacksize(realattr, stack_size);
}
+#ifdef __GLIBC__
static int _hybris_hook_pthread_attr_setstackaddr(pthread_attr_t *__attr, void *stack_addr)
{
pthread_attr_t *realattr = (pthread_attr_t *) *(uintptr_t *) __attr;
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -548,6 +553,7 @@ static int _hybris_hook_pthread_attr_getstackaddr(pthread_attr_t const *__attr,
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return pthread_attr_getstackaddr(realattr, stack_addr);
}
+#endif
static int _hybris_hook_pthread_attr_setstack(pthread_attr_t *__attr, void *stack_base, size_t stack_size)
{
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1134,6 +1140,7 @@ static int _hybris_hook_pthread_rwlockattr_getpshared(pthread_rwlockattr_t *__at
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return pthread_rwlockattr_getpshared(realattr, pshared);
}
+#ifdef __GLIBC__
int _hybris_hook_pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *attr, int pref)
{
pthread_rwlockattr_t *realattr = (pthread_rwlockattr_t *) *(uintptr_t *) attr;
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1151,6 +1158,7 @@ int _hybris_hook_pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *attr,
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return pthread_rwlockattr_getkind_np(realattr, pref);
}
+#endif
/*
* pthread_rwlock_* functions
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1500,10 +1508,14 @@ static int _hybris_hook_fgetpos(FILE *fp, bionic_fpos_t *pos)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
{
TRACE_HOOK("fp %p pos %p", fp, pos);
+#ifdef __GLIBC__
fpos_t my_fpos;
int ret = fgetpos(_get_actual_fp(fp), &my_fpos);
*pos = my_fpos.__pos;
+#else
+ int ret = fgetpos(_get_actual_fp(fp), pos);
+#endif
return ret;
}
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1589,12 +1601,16 @@ static int _hybris_hook_fsetpos(FILE *fp, const bionic_fpos_t *pos)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
{
TRACE_HOOK("fp %p pos %p", fp, pos);
+#ifdef __GLIBC__
fpos_t my_fpos;
my_fpos.__pos = *pos;
memset(&my_fpos.__state, 0, sizeof(mbstate_t));
mbsinit(&my_fpos.__state);
return fsetpos(_get_actual_fp(fp), &my_fpos);
+#else
+ return fsetpos(_get_actual_fp(fp), pos);
+#endif
}
static long _hybris_hook_ftell(FILE *fp)
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1872,6 +1888,7 @@ static int _hybris_hook_versionsort(struct bionic_dirent **a,
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return strverscmp((*a)->d_name, (*b)->d_name);
}
+#ifdef __GLIBC__
static int _hybris_hook_scandirat(int fd, const char *dir,
struct bionic_dirent ***namelist,
int (*filter) (const struct bionic_dirent *),
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1933,6 +1950,7 @@ static int _hybris_hook_scandir(const char *dir,
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
{
return _hybris_hook_scandirat(AT_FDCWD, dir, namelist, filter, compar);
}
+#endif
static inline void swap(void **a, void **b)
{
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2190,6 +2208,7 @@ int _hybris_hook_open(const char *pathname, int flags, ...)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return open(target_path, flags, mode);
}
+#ifdef __GLIBC__
/**
* Wrap some GCC builtin functions, which don't have any address
*/
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2215,6 +2234,7 @@ __THROW int _hybris_hook___snprintf_chk (char *__restrict __s, size_t __n, int _
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return ret;
}
+#endif
static __thread void *tls_hooks[16];
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2360,6 +2380,7 @@ static char* _hybris_hook_setlocale(int category, const char *locale)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return setlocale(category, locale);
}
+#ifdef __GLIBC__
static void* _hybris_hook_mmap(void *addr, size_t len, int prot,
int flags, int fd, off_t offset)
{
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2375,6 +2396,7 @@ static int _hybris_hook_munmap(void *addr, size_t length)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
return munmap(addr, length);
}
+#endif
extern size_t strlcat(char *dst, const char *src, size_t siz);
extern size_t strlcpy(char *dst, const char *src, size_t siz);
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2635,7 +2657,9 @@ static struct _hook hooks_common[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_DIRECT_NO_DEBUG(realloc),
HOOK_DIRECT_NO_DEBUG(memalign),
HOOK_DIRECT_NO_DEBUG(valloc),
+#ifdef __GLIBC__
HOOK_DIRECT_NO_DEBUG(pvalloc),
+#endif
HOOK_DIRECT(fread),
HOOK_DIRECT_NO_DEBUG(getxattr),
HOOK_DIRECT(mprotect),
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2685,8 +2709,10 @@ static struct _hook hooks_common[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_DIRECT_NO_DEBUG(bcopy),
HOOK_DIRECT_NO_DEBUG(bzero),
HOOK_DIRECT_NO_DEBUG(ffs),
+#ifdef __GLIBC__
HOOK_INDIRECT(__sprintf_chk),
HOOK_INDIRECT(__snprintf_chk),
+#endif
/* pthread.h */
HOOK_DIRECT_NO_DEBUG(getauxval),
HOOK_INDIRECT(gettid),
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2745,8 +2771,10 @@ static struct _hook hooks_common[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_INDIRECT(pthread_attr_getschedparam),
HOOK_INDIRECT(pthread_attr_setstacksize),
HOOK_INDIRECT(pthread_attr_getstacksize),
+#ifdef __GLIBC__
HOOK_INDIRECT(pthread_attr_setstackaddr),
HOOK_INDIRECT(pthread_attr_getstackaddr),
+#endif
HOOK_INDIRECT(pthread_attr_setstack),
HOOK_INDIRECT(pthread_attr_getstack),
HOOK_INDIRECT(pthread_attr_setguardsize),
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2868,8 +2896,10 @@ static struct _hook hooks_common[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_DIRECT_NO_DEBUG(seekdir),
HOOK_DIRECT_NO_DEBUG(telldir),
HOOK_DIRECT_NO_DEBUG(dirfd),
+#ifdef __GLIBC__
HOOK_INDIRECT(scandir),
HOOK_INDIRECT(scandirat),
+#endif
HOOK_INDIRECT(alphasort),
HOOK_INDIRECT(versionsort),
/* fcntl.h */
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2893,7 +2923,9 @@ static struct _hook hooks_common[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_DIRECT_NO_DEBUG(localtime_r),
HOOK_DIRECT_NO_DEBUG(gmtime),
HOOK_DIRECT_NO_DEBUG(abort),
+#ifdef __GLIBC__
HOOK_DIRECT_NO_DEBUG(writev),
+#endif
/* unistd.h */
HOOK_DIRECT_NO_DEBUG(access),
/* grp.h */
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2912,13 +2944,17 @@ static struct _hook hooks_mm[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_DIRECT(putenv),
HOOK_DIRECT(clearenv),
HOOK_DIRECT_NO_DEBUG(dprintf),
+#ifdef __GLIBC__
HOOK_DIRECT_NO_DEBUG(mallinfo),
+#endif
HOOK_DIRECT(malloc_usable_size),
HOOK_DIRECT(posix_memalign),
HOOK_DIRECT(mprotect),
HOOK_TO(__gnu_strerror_r, _hybris_hook__gnu_strerror_r),
+#ifdef __GLIBC__
HOOK_INDIRECT(pthread_rwlockattr_getkind_np),
HOOK_INDIRECT(pthread_rwlockattr_setkind_np),
+#endif
/* unistd.h */
HOOK_DIRECT(fork),
HOOK_DIRECT_NO_DEBUG(ttyname),
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2940,15 +2976,21 @@ static struct _hook hooks_mm[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
HOOK_DIRECT(localeconv),
HOOK_DIRECT(setlocale),
/* sys/mman.h */
+#ifdef __GLIBC__
+ // mmap from musl considers offsets from gralloc to be invalid,
+ // so avoid hooking it
HOOK_DIRECT(mmap),
HOOK_DIRECT(munmap),
+#endif
/* wchar.h */
HOOK_DIRECT_NO_DEBUG(wmemchr),
HOOK_DIRECT_NO_DEBUG(wmemcmp),
HOOK_DIRECT_NO_DEBUG(wmemcpy),
HOOK_DIRECT_NO_DEBUG(wmemmove),
HOOK_DIRECT_NO_DEBUG(wmemset),
+#ifdef __GLIBC__
HOOK_DIRECT_NO_DEBUG(wmempcpy),
+#endif
HOOK_INDIRECT(fputws),
// It's enough to hook vfwprintf here as fwprintf will call it with a
// proper va_list in place so we don't have to handle this here.
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -3002,9 +3044,11 @@ static struct _hook hooks_mm[] = {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
/* dirent.h */
HOOK_TO(readdir64, _hybris_hook_readdir),
HOOK_TO(readdir64_r, _hybris_hook_readdir_r),
+#ifdef __GLIBC__
HOOK_INDIRECT(scandir),
HOOK_INDIRECT(scandirat),
HOOK_TO(scandir64, _hybris_hook_scandir),
+#endif
};
diff --git a/hybris/common/hooks_shm.c b/hybris/common/hooks_shm.c
index c90cee5..27dfeef 100644
--- a/hybris/common/hooks_shm.c
+++ b/hybris/common/hooks_shm.c
@@ -33,6 +33,10 @@
#include <sys/shm.h>
#include <sys/mman.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
+
/* Debug */
#include "logging.h"
#define LOGD(message, ...) HYBRIS_DEBUG_LOG(HOOKS, message, ##__VA_ARGS__)
diff --git a/hybris/common/jb/dlfcn.c b/hybris/common/jb/dlfcn.c
index 78500e4..6996527 100644
--- a/hybris/common/jb/dlfcn.c
+++ b/hybris/common/jb/dlfcn.c
@@ -23,6 +23,10 @@
#include "linker.h"
#include "linker_format.h"
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {{PTHREAD_MUTEX_RECURSIVE}}
+#endif
+
/* This file hijacks the symbols stubbed out in libdl.so. */
#define DL_SUCCESS 0
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
diff --git a/hybris/common/legacy_properties/properties.c b/hybris/common/legacy_properties/properties.c
index 0191e7c..c96bd59 100644
--- a/hybris/common/legacy_properties/properties.c
+++ b/hybris/common/legacy_properties/properties.c
@@ -36,6 +36,9 @@
#include <poll.h>
#include <hybris/properties/properties.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
#include "properties_p.h"
static const char property_service_socket[] = "/dev/socket/" PROP_SERVICE_NAME;
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
diff --git a/hybris/common/mm/bionic/libc/include/link.h b/hybris/common/mm/bionic/libc/include/link.h
index cb8e139..10d105d 100644
--- a/hybris/common/mm/bionic/libc/include/link.h
+++ b/hybris/common/mm/bionic/libc/include/link.h
@@ -29,6 +29,7 @@
#define _LINK_H_
#include <sys/types.h>
+#include <sys/cdefs.h>
#include <elf.h>
__BEGIN_DECLS
diff --git a/hybris/common/mm/bionic/libc/private/libc_logging.h b/hybris/common/mm/bionic/libc/private/libc_logging.h
index 6beb47e..e526c03 100644
--- a/hybris/common/mm/bionic/libc/private/libc_logging.h
+++ b/hybris/common/mm/bionic/libc/private/libc_logging.h
@@ -33,6 +33,8 @@
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
__BEGIN_DECLS
@@ -73,7 +75,18 @@ struct abort_msg_t {
// Formats a message to the log (priority 'fatal'), then aborts.
//
+#ifdef __GLIBC__
void __libc_fatal(const char* format, ...);
+#else
+void inline __libc_fatal(const char* format, ...)
+{
+ va_list ap;
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ abort();
+}
+#endif
//
// Formats a message to the log (priority 'fatal'), but doesn't abort.
diff --git a/hybris/common/mm/dlfcn.cpp b/hybris/common/mm/dlfcn.cpp
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
index 13976db..d0ec9e5 100644
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
--- a/hybris/common/mm/dlfcn.cpp
+++ b/hybris/common/mm/dlfcn.cpp
@@ -31,6 +31,10 @@
#include "hybris_compat.h"
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {{PTHREAD_MUTEX_RECURSIVE}}
+#endif
+
#ifdef WANT_ARM_TRACING
#include "../wrappers.h"
#endif
diff --git a/hybris/common/mm/hybris_compat.h b/hybris/common/mm/hybris_compat.h
index 2e10383..de1d852 100644
--- a/hybris/common/mm/hybris_compat.h
+++ b/hybris/common/mm/hybris_compat.h
@@ -32,6 +32,9 @@
#include <string.h>
#include <memory.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
extern "C" size_t strlcpy(char *dest, const char *src, size_t size);
extern "C" size_t strlcat(char *dst, const char *src, size_t size);
@@ -55,4 +58,12 @@ extern "C" size_t strlcat(char *dst, const char *src, size_t size);
#define DT_ANDROID_RELA (DT_LOOS + 4)
#define DT_ANDROID_RELASZ (DT_LOOS + 5)
+#if defined (__aarch64__)
+
+#ifndef R_AARCH64_IRELATIVE
+#define R_AARCH64_IRELATIVE 1032
+#endif
+
+#endif
+
#endif
diff --git a/hybris/common/mm/linker.cpp b/hybris/common/mm/linker.cpp
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
index 42340cc..986d065 100644
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
--- a/hybris/common/mm/linker.cpp
+++ b/hybris/common/mm/linker.cpp
@@ -38,6 +38,9 @@
#include <sys/mman.h>
#include <sys/param.h>
#include <unistd.h>
+#ifndef __GLIBC__
+#include <libgen.h>
+#endif
#include <new>
#include <string>
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -1193,7 +1196,11 @@ static const char* fix_dt_needed(const char* dt_needed, const char* sopath) {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
#if !defined(__LP64__)
// Work around incorrect DT_NEEDED entries for old apps: http://b/21364029
if (get_application_target_sdk_version() <= 22) {
+#ifdef __GLIBC__
const char* bname = basename(dt_needed);
+#else
+ const char* bname = (const char*) basename((char*)dt_needed);
+#endif
if (bname != dt_needed) {
DL_WARN("'%s' library has invalid DT_NEEDED entry '%s'", sopath, dt_needed);
}
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -2924,7 +2931,11 @@ bool soinfo::prelink_image() {
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
// the main executable and linker; they do not need to have dt_soname
if (soname_ == nullptr && this != somain && (flags_ & FLAG_LINKER) == 0 &&
get_application_target_sdk_version() <= 22) {
+#ifdef __GLIBC__
soname_ = basename(realpath_.c_str());
+#else
+ soname_ = (const char*) basename((char*) realpath_.c_str());
+#endif
DL_WARN("%s: is missing DT_SONAME will use basename as a replacement: \"%s\"",
get_realpath(), soname_);
}
diff --git a/hybris/common/n/bionic/libc/include/dlfcn.h b/hybris/common/n/bionic/libc/include/dlfcn.h
index c2e8980..692ce52 100644
--- a/hybris/common/n/bionic/libc/include/dlfcn.h
+++ b/hybris/common/n/bionic/libc/include/dlfcn.h
@@ -46,8 +46,8 @@ typedef struct {
extern void* dlopen(const char* filename, int flag);
extern int dlclose(void* handle);
extern const char* dlerror(void);
-extern void* dlsym(void* handle, const char* symbol) __nonnull((2));
-extern void* dlvsym(void* handle, const char* symbol, const char* version) __nonnull((2, 3));
+extern void* dlsym(void* handle, const char* symbol) __attribute__((nonnull((2))));
+extern void* dlvsym(void* handle, const char* symbol, const char* version) __attribute__((nonnull((2, 3))));
extern int dladdr(const void* addr, Dl_info *info);
enum {
diff --git a/hybris/common/n/bionic/libc/include/link.h b/hybris/common/n/bionic/libc/include/link.h
index cb8e139..10d105d 100644
--- a/hybris/common/n/bionic/libc/include/link.h
+++ b/hybris/common/n/bionic/libc/include/link.h
@@ -29,6 +29,7 @@
#define _LINK_H_
#include <sys/types.h>
+#include <sys/cdefs.h>
#include <elf.h>
__BEGIN_DECLS
diff --git a/hybris/common/n/bionic/libc/private/libc_logging.h b/hybris/common/n/bionic/libc/private/libc_logging.h
index a696cec..2da0238 100644
--- a/hybris/common/n/bionic/libc/private/libc_logging.h
+++ b/hybris/common/n/bionic/libc/private/libc_logging.h
@@ -33,6 +33,8 @@
#include <stdarg.h>
#include <stddef.h>
#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
__BEGIN_DECLS
@@ -73,7 +75,18 @@ struct abort_msg_t {
// Formats a message to the log (priority 'fatal'), then aborts.
//
-void __libc_fatal(const char* format, ...);
+#ifdef __GLIBC__
+ void __libc_fatal(const char* format, ...);
+#else
+void inline __libc_fatal(const char* format, ...)
+{
+ va_list ap;
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ abort();
+}
+#endif
//
// Formats a message to the log (priority 'fatal'), but doesn't abort.
diff --git a/hybris/common/n/dlfcn.cpp b/hybris/common/n/dlfcn.cpp
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
index 92c1349..bfdbb9c 100644
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
--- a/hybris/common/n/dlfcn.cpp
+++ b/hybris/common/n/dlfcn.cpp
@@ -30,6 +30,10 @@
#include "hybris_compat.h"
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {{PTHREAD_MUTEX_RECURSIVE}}
+#endif
+
/* This file hijacks the symbols stubbed out in libdl.so. */
static pthread_mutex_t g_dl_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
diff --git a/hybris/common/n/hybris_compat.cpp b/hybris/common/n/hybris_compat.cpp
index cfe1e78..5238409 100644
--- a/hybris/common/n/hybris_compat.cpp
+++ b/hybris/common/n/hybris_compat.cpp
@@ -27,3 +27,11 @@
*/
#include "hybris_compat.h"
+
+#ifndef __GLIBC__
+const char *gnu_basename(const char *path)
+{
+ char *base = strrchr(path, '/');
+ return base ? base + 1 : path;
+}
+#endif
diff --git a/hybris/common/n/hybris_compat.h b/hybris/common/n/hybris_compat.h
index 2e10383..77a0919 100644
--- a/hybris/common/n/hybris_compat.h
+++ b/hybris/common/n/hybris_compat.h
@@ -32,6 +32,9 @@
#include <string.h>
#include <memory.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
extern "C" size_t strlcpy(char *dest, const char *src, size_t size);
extern "C" size_t strlcat(char *dst, const char *src, size_t size);
@@ -55,4 +58,23 @@ extern "C" size_t strlcat(char *dst, const char *src, size_t size);
#define DT_ANDROID_RELA (DT_LOOS + 4)
#define DT_ANDROID_RELASZ (DT_LOOS + 5)
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
+#if defined (__aarch64__)
+
+#ifndef R_AARCH64_TLS_DTPREL32
+#define R_AARCH64_TLS_DTPREL32 1031
+#endif
+
+#ifndef R_AARCH64_IRELATIVE
+#define R_AARCH64_IRELATIVE 1032
+#endif
+
+#endif
+
+#ifndef __GLIBC__
+#ifndef basename
+const char *gnu_basename(const char *path);
+#define basename gnu_basename
+#endif
+#endif
+
#endif
diff --git a/hybris/common/o/bionic/libc/include/dlfcn.h b/hybris/common/o/bionic/libc/include/dlfcn.h
index acec4a2..3943882 100644
--- a/hybris/common/o/bionic/libc/include/dlfcn.h
+++ b/hybris/common/o/bionic/libc/include/dlfcn.h
@@ -57,11 +57,11 @@ typedef struct {
} Dl_info;
void* dlopen(const char* filename, int flag);
-int dlclose(void* handle) __nonnull((1));
+int dlclose(void* handle) __attribute__((nonnull((1))));
char* dlerror(void);
-void* dlsym(void* handle, const char* symbol) __nonnull((2));
-void* dlvsym(void* handle, const char* symbol, const char* version) __nonnull((2, 3));
-int dladdr(const void* addr, Dl_info* info) __nonnull((2));
+void* dlsym(void* handle, const char* symbol) __attribute__((nonnull((2))));
+void* dlvsym(void* handle, const char* symbol, const char* version) __attribute__((nonnull((2, 3))));
+int dladdr(const void* addr, Dl_info* info) __attribute__((nonnull((2))));
#define RTLD_LOCAL 0
#define RTLD_LAZY 0x00001
diff --git a/hybris/common/o/dlfcn.cpp b/hybris/common/o/dlfcn.cpp
index 6fddbbb..f98f4d2 100644
--- a/hybris/common/o/dlfcn.cpp
+++ b/hybris/common/o/dlfcn.cpp
@@ -42,6 +42,10 @@
#include "private/bionic_tls.h"
#include "private/ScopedPthreadMutexLocker.h"
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {{PTHREAD_MUTEX_RECURSIVE}}
+#endif
+
static pthread_mutex_t g_dl_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
static __thread char *dl_err_str;
diff --git a/hybris/common/o/hybris_compat.cpp b/hybris/common/o/hybris_compat.cpp
index cfe1e78..5238409 100644
--- a/hybris/common/o/hybris_compat.cpp
+++ b/hybris/common/o/hybris_compat.cpp
@@ -27,3 +27,11 @@
*/
#include "hybris_compat.h"
+
+#ifndef __GLIBC__
+const char *gnu_basename(const char *path)
+{
+ char *base = strrchr(path, '/');
+ return base ? base + 1 : path;
+}
+#endif
diff --git a/hybris/common/o/hybris_compat.h b/hybris/common/o/hybris_compat.h
index 2e10383..77a0919 100644
--- a/hybris/common/o/hybris_compat.h
+++ b/hybris/common/o/hybris_compat.h
@@ -32,6 +32,9 @@
#include <string.h>
#include <memory.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
extern "C" size_t strlcpy(char *dest, const char *src, size_t size);
extern "C" size_t strlcat(char *dst, const char *src, size_t size);
@@ -55,4 +58,23 @@ extern "C" size_t strlcat(char *dst, const char *src, size_t size);
#define DT_ANDROID_RELA (DT_LOOS + 4)
#define DT_ANDROID_RELASZ (DT_LOOS + 5)
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
+#if defined (__aarch64__)
+
+#ifndef R_AARCH64_TLS_DTPREL32
+#define R_AARCH64_TLS_DTPREL32 1031
+#endif
+
+#ifndef R_AARCH64_IRELATIVE
+#define R_AARCH64_IRELATIVE 1032
+#endif
+
+#endif
+
+#ifndef __GLIBC__
+#ifndef basename
+const char *gnu_basename(const char *path);
+#define basename gnu_basename
+#endif
+#endif
+
#endif
diff --git a/hybris/include/hybris/common/musl_compat.h b/hybris/include/hybris/common/musl_compat.h
new file mode 100644
index 0000000..c5f86f2
--- /dev/null
+++ b/hybris/include/hybris/common/musl_compat.h
@@ -0,0 +1,10 @@
+#include <unistd.h>
+/* taken from glibc unistd.h and fixes musl */
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
+ (__extension__ \
+ ({ long int __result; \
+ do __result = (long int) (expression); \
+ while (__result == -1L && errno == EINTR); \
+ __result; }))
+#endif
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
diff --git a/hybris/libsync/sync.c b/hybris/libsync/sync.c
index dbc3eba..e66840a 100644
--- a/hybris/libsync/sync.c
+++ b/hybris/libsync/sync.c
@@ -27,6 +27,7 @@
#include <linux/sync.h>
#include <linux/sw_sync.h>
#else
+#include <sys/cdefs.h>
#include <sync/sync.h>
#endif
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
diff --git a/hybris/tests/test_camera.c b/hybris/tests/test_camera.c
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
index 7ac81f4..b7993a9 100644
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
--- a/hybris/tests/test_camera.c
+++ b/hybris/tests/test_camera.c
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
@@ -45,6 +45,10 @@
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
#include <sys/stat.h>
#include <sys/types.h>
+#ifndef __GLIBC__
+#include <hybris/common/musl_compat.h>
+#endif
+
int shot_counter = 1;
int32_t current_zoom_level = 1;
bool new_camera_frame_available = true;
--
hybris/libhybris: new upstream snapshot, compile against Android 9.0 headers (!665)
2019-09-25 11:11:17 +00:00
2.23.0
Package libhybris (#1402) As discussed in #1039, I want to split feature/hybris branch into smaller sensible pull requests. This is the first one that simply adds android-headers and libhybris packaging. libhybris allows apps compiled with glibc (musl in our case) to load Android libraries that utilize bionic libc, which is used to load proprietary userspace drivers. The package isn't very useful on its own and requires core (non-UI/Java) Android services to be running in some way - either in Halium-style LXC container or in same root as main OS with modified init (Mer/Sailfish do it this way). Both ways are tested to work in postmarketOS. libhybris also includes some tests, not all of them are known to be representative, but test_vibrator and test_egl_configs are usually good indicators if system is set up correctly.
2018-04-10 21:13:42 +00:00
Reference in a new issue Copy permalink