Applying: (hybris) Fix __get_tls and related functions (>=Android 8)
Applying: (hybris) Add support for get and list of properties.
Applying: (hybris) bionic_tls.h: shifting TLS slots to avoid conflicts with libc/hybris
Applying: (hybris) disable tls usage in locale.cpp, to avoid problems with libhybris
Applying: (hybris) Fix TLS slots for x86 Aligns with this libhybris patch: https://github.com/libhybris/libhybris/pull/370
Applying: (hybris) don't fail because of fsetxattr
Applying: (halium) libdl: neutralize cfi_slowpath_common as it breaks libhybris
Applying: (halium) use 127.0.1.1 as fallback DNS server
Applying: (halium) disable update_verifier service
Applying: (hybris) rename dbus group to adbus to avoid conflicts with mer.
Applying: (hybris) build minimization (might be improveable, but this version doesn't break dependancies)
Applying: (hybris) Reduce vendorimage build size.
Applying: (halium) add basic Halium build configuration based on embedded.mk
Applying: (halium) vndk: depend on 32-bit libraries as well
Applying: (halium) disable CFI for arm64 as it seems to break libhybris
Applying: (halium): Enable xzcat
Applying: (hybris) AudioService is disabled in hybris adaptations
Applying: (halium) disable media-related services
Applying: (halium) Rely on local codec list only, we do not run media.player/service.
Applying: (halium) compile libmediaplayerservice both for 32-bit and 64-bit
Applying: (halium) get rid of using AudioFlinger for recording
Applying: (halium) Enable video and audio recording from camera.
.git/rebase-apply/patch:112: trailing whitespace.

warning: 1 line adds whitespace errors.
Applying: Camera: skip unnecessary reconfig
Applying: (hybris) Use mini services and disable starting unneeded services.
Applying: (hybris) Pick GLES shared objects from appropriate paths (32-bit case)
Applying: (hybris) Use private __get_tls_hooks from bionic
Applying: (hybris) Allow surfaceflinger to be started from SailfishOS.
Applying: (hybris) Create the (somehow) missing settingsd socket for rild
Applying: (hybris) use libselinux_stubs in servicemanager
Applying: (halium) remove /usr/libexec/droid-hybris from paths
Applying: (halium) include vndservicemanager into system partition to override service
Applying: (halium) binder: don't use android's check permission feature
Applying: (halium) libgui: do not abort in proxified addAndGetFrameTimestamps
Applying: CCodec: Force androidmedia-compatible color formats
Applying: Client: Filter out non-qti codecs
Applying: (hybris) Add aapcs float handling to audio api headers
Applying: (hybris) Search for libraries first from /usr/libexec/droid-hybris/system/lib/hw/.
Applying: (hybris) gps.h Use proper aapcs attribute with functions with float arguments
Applying: (halium) don't fail with error on missing HYBRIS_DATA_PART
Applying: (hybris) Add /usr/libexec/droid-hybris/lib-dev-alog/ to the LD_LIBRARY_PATH for all init'ed binaries to support the /dev/alog used in Mer
Applying: (hybris) Don't create/mount dev/proc/sys... when booting with Mer
Applying: (hybris) Mer can specify mis-alignment handling - this is the wrong place to set it
Applying: (hybris) Mount points are handled by Mer
Applying: (hybris) Systemd handles control groups
Applying: (hybris) Mer uses udev
Applying: (hybris) Add a ready trigger to init to run post boot
Applying: (hybris) Notify Mer's systemd that we're done
Applying: (hybris) Disable usb import
Applying: (hybris) allow system group to trigger haptics
Applying: (hybris) trigger late_start on property change
Applying: (hybris) property_service.c: adding support for getprop and listprop
Applying: (hybris) reach main init state
Applying: (hybris) Disable setting hostname and domainname in init.rc.
Applying: (hybris) Update rootdir for 64bit libs
Applying: (hybris) Disable all zygote variations
Applying: (hybris) Disable ueventd service
Applying: (hybris) Disable SELinux
Applying: (hybris) Properly handle shutdown from Mer.
Applying: (hybris) Use services from /usr/libexec/droid-hybris/system/etc/init/.
Applying: (hybris) Remove LD_LIBRARY_PATH from init.environ.rc
Applying: (hybris) define 32-bit LD_LIBRARY_PATH for 32-bit devices
Applying: (hybris) Fix list and get properties.
Applying: (hybris) more SELinux disablement
Applying: (hybris) don't try to mount since mer handles this
Applying: (hybris) avoid attempting to mount partitions, mer/systemd handles this
Applying: (hybris) load services from droid-hybris as early as possible
Applying: (hybris) disable remnants of SELinux which currently break
Applying: (hybris) disable the usage of libprocessgroup, since it is incompatible.
Applying: (hybris) disable vendor symlink
Applying: (hybris) ignore "mount" and "mkdir /tmp" commands entirely.
Applying: (hybris) Fix actdead charging animation. MER#1949
Applying: (hybris)[system/core] Disable usb config.
Applying: (hybris) Remove /sbin from droid PATH.
Applying: (hybris) Fix return value type of mount command.
Applying: (hybris) disable some more selinux functionality.
Applying: (hybris) Disable /mnt tmpfs creation
Applying: (hybris) Disable init_user0 which is not needed on Mer.
Applying: (halium) Allow libselinux_stubs.so to be preloaded into vendor binaries
Applying: (halium) start ueventd if init is PID 1 (as in LXC container)
Applying: (halium) init: Handle udev event peaks
Applying: (hybris) invoke queue_fs_event(FS_MGR_MNTALL_DEV_NOT_ENCRYPTED)
Applying: (halium) Disable lmkd and turn it into non-critical service
Applying: (halium) init: ignore non-kernel messages in ReadUevent
Applying: init: Set up runtime mounts in recovery mode
Applying: (halium) preload SELinux stubs
Applying: (halium) disable netd
Applying: (halium) disable keystore service
Applying: (halium) preload SELinux stubs