|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan.spec
|
|
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -1,82 +0,0 @@
-Description: Pattern with packages for @DEVICE@ HW Adaptation
-Name: jolla-hw-adaptation-@DEVICE@
-Requires:
-- droid-hal-@DEVICE@
-- droid-hal-@DEVICE@-img-boot
-- droid-hal-@DEVICE@-kernel-modules
-- droid-config-@DEVICE@-sailfish
-- droid-config-@DEVICE@-pulseaudio-settings
-- droid-config-@DEVICE@-policy-settings
-- droid-config-@DEVICE@-preinit-plugin
-- droid-config-@DEVICE@-flashing
-- droid-config-@DEVICE@-bluez5
-- droid-hal-version-@DEVICE@
-
-# Hybris packages
-- libhybris-libEGL
-- libhybris-libGLESv2
-- libhybris-libwayland-egl
-
-# Sensors
-- hybris-libsensorfw-qt5
-
-# Vibra
-- ngfd-plugin-native-vibrator
-- qt5-feedback-haptics-native-vibrator
-
-# Needed for /dev/touchscreen symlink
-- qt5-plugin-generic-evdev
-
-- pulseaudio-modules-droid
-# for audio recording to work:
-- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
-
-# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
-- qt5-qtwayland-wayland_egl
-- qt5-qpa-hwcomposer-plugin
-- qtscenegraph-adaptation
-
-# Add GStreamer v1.0 as standard
-- gstreamer1.0
-- gstreamer1.0-plugins-good
-- gstreamer1.0-plugins-base
-- gstreamer1.0-plugins-bad
-- nemo-gstreamer1.0-interfaces
-# For devices with droidmedia and gst-droid built, see HADK pdf for more information
-#- gstreamer1.0-droid
-
-# This is needed for notification LEDs
-- mce-plugin-libhybris
-
-## USB mode controller
-# Enables mode selector upon plugging USB cable:
-- usb-moded
-- usb-moded-defaults-android
-- usb-moded-developer-mode-android
-
-# Extra useful modes not officially supported:
-# might need some configuration to get working
-#- usb-moded-mass-storage-android-config
-# working but careful with roaming!
-- usb-moded-connection-sharing-android-config
-# android diag mode only usable for certain android tools
-#- usb-moded-diag-mode-android
-
-# hammerhead, grouper, and maguro use this in scripts, so include for all
-- rfkill
-
-# enable device lock and allow to select untrusted software
-- jolla-devicelock-daemon-encsfa
-
-# For GPS
-- geoclue-provider-hybris
-
-# For FM radio on some QCOM devices
-#- qt5-qtmultimedia-plugin-mediaservice-irisradio
-#- jolla-mediaplayer-radio
-
-# For devices with SD Card
-#- sd-utils
-
-Summary: Jolla HW Adaptation @DEVICE@
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
| -(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd-prepare.service
^
|
| @@ -1,17 +0,0 @@
-# Copyright (C) 2013 Jolla Oy
-#
-# Prepare functionfs for adbd
-
-[Unit]
-Description=functionfs setup for adbd
-
-[Service]
-Type=notify
-RemainAfterExit=yes
-ExecStart=/usr/sbin/adbd-functionfs.sh
-ExecStopPost=/bin/umount adb
-ExecStopPost=/bin/umount adb
-
-[Install]
-WantedBy=graphical.target
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service
^
|
| @@ -1,10 +0,0 @@
-[Unit]
-Description=Android Debug Bridge Daemon
-Requires=adbd-prepare.service
-After=adbd-prepare.service
-PartOf=adbd-prepare.service
-
-[Service]
-Environment=PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-ExecStart=/sbin/adbd
-Restart=always
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
| @@ -1,24 +0,0 @@
-[Unit]
-Description=droid-hal-init
-Wants=systemd-udev-settle.service
-After=local-fs.target systemd-udev-settle.service systemd-tmpfiles-setup.service
-Before=basic.target network.target bluetooth.service ofono.service sensorfwd.service
-DefaultDependencies=no
-Conflicts=shutdown.target
-# Lets not do Requires= here as that means that this service will restart which leads automatically
-# to broken state as android init can be only started once per boot. If something goes wrong
-# our best hope is that android init doesn't notice that and that the crashing party fixes itself :)
-
-[Service]
-Type=notify
-NotifyAccess=all
-ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
-ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh %c
-Restart=always
-# Lets make sure we don't block minutes in case of errors.
-TimeoutSec=15
-StartLimitInterval=60
-StartLimitBurst=2
-
-[Install]
-WantedBy=graphical.target
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/graphical.target.wants/droid-hal-init.service
^
|
| -(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/graphical.target.wants/droid-late-start.service
^
|
| -(symlink to ../droid-late-start.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/usr/sbin/adbd-functionfs.sh
^
|
| @@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-mkdir -p /dev/usb-ffs
-chmod 0770 /dev/usb-ffs
-chown shell:shell /dev/usb-ffs
-mkdir -p /dev/usb-ffs/adb
-chmod 0770 /dev/usb-ffs/adb
-chown shell:shell /dev/usb-ffs/adb
-/bin/mount -t functionfs adb /dev/usb-ffs/adb -o uid=shell,gid=shell
-exit 0
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/usr/share/environment/nemo/hybris.conf
^
|
| @@ -1,2 +0,0 @@
-# Ensure that we can find hybris libs from any hybris-enabled binary
-HYBRIS_LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/droid-configs-device/sparse/var/lib/environment/nemo/99-hybris.conf
^
|
| @@ -1,2 +0,0 @@
-# Ensure that we can find hybris libs from any hybris-enabled binary
-HYBRIS_LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/patterns/jolla-hw-adaptation-titan.yaml
^
|
| @@ -1,103 +0,0 @@
-# Feel free to disable non-critical HA parts during devel by commenting lines out
-# Generated in hadk by executing: rpm/dhd/helpers/add_new_device.sh
-
-Description: Pattern with packages for titan HW Adaptation
-Name: jolla-hw-adaptation-titan
-Requires:
-
-- droid-hal-titan
-- droid-hal-titan-img-boot
-- droid-hal-titan-kernel
-- droid-hal-titan-kernel-modules
-- droid-hal-titan-detritus
-- droid-config-titan-sailfish
-- droid-config-titan-pulseaudio-settings
-- droid-config-titan-policy-settings
-- droid-config-titan-preinit-plugin
-- droid-config-titan-flashing
-- droid-config-titan-bluez4
-- droid-hal-version-titan
-
-# Hybris packages
-- libhybris-libEGL
-- libhybris-libGLESv2
-- libhybris-libwayland-egl
-
-# Sensors
-- hybris-libsensorfw-qt5
-
-# Vibra
-- ngfd-plugin-native-vibrator
-- qt5-feedback-haptics-native-vibrator
-
-# Needed for /dev/touchscreen symlink
-- qt5-plugin-generic-evdev
-
-- pulseaudio-modules-droid
-
-# for audio recording to work:
-- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
-
-# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
-- qt5-qtwayland-wayland_egl
-- qt5-qpa-hwcomposer-plugin
-- qtscenegraph-adaptation
-
-# GStreamer v0.10 multimedia support is being deprecated
-#- gstreamer0.10-droidcamsrc
-#- gstreamer0.10-omx
-#- gstreamer0.10-droideglsink
-#- nemo-qtmultimedia-plugins-gstvideotexturebackend
-
-# Add GStreamer v1.0 as standard
-- gstreamer1.0
-- gstreamer1.0-plugins-good
-- gstreamer1.0-plugins-base
-- gstreamer1.0-plugins-bad
-- nemo-gstreamer1.0-interfaces
-- gstreamer1.0-droid
-
-# This is needed for notification LEDs
-- mce-plugin-libhybris
-
-## USB mode controller
-# Enables mode selector upon plugging USB cable:
-- usb-moded
-- usb-moded-defaults-android
-- usb-moded-developer-mode-android
-
-# Extra useful modes not officially supported:
-# working but careful with roaming!
-- usb-moded-connection-sharing-android-config
-# android diag mode only usable for certain android tools
-#- usb-moded-diag-mode-android
-
-# jolla-rnd-device will enable usb-moded even when UI is not yet
-# brought up (useful during development, available since update10)
-- jolla-rnd-device
-
-# from update13, this is needed explicitly
-#- bluez-configs-sailfish
-# hammerhead, grouper, and maguro use this in scripts, so include for all
-- rfkill
-
-# enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
-
-# For GPS
-- geoclue-provider-hybris
-# For Mozilla location services (online)
-- geoclue-provider-mlsdb
-
-# Fix for calls
-- pulseaudio-modules-droid-glue
-
-# Flashlight
-- jolla-settings-system-flashlight
-
-# For FM radio
-- qt5-qtmultimedia-plugin-mediaservice-irisradio
-- jolla-mediaplayer-radio
-
-Summary: Jolla HW Adaptation titan
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/droid-fm-up.service
^
|
| -(symlink to ../droid-fm-up.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/sparse/lib/systemd/system/bluetooth.service.wants/droid-hcismd-up.service
^
|
| -(symlink to ../droid-hcismd-up.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/sparse/lib/systemd/system/graphical.target.wants/sensors-delay-hack.service
^
|
| -(symlink to ../sensors-delay-hack.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/sparse/lib/systemd/system/local-fs.target.wants/pds.service
^
|
| -(symlink to ../pds.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/sparse/lib/systemd/system/multi-user.target.wants/wlan-module-load.service
^
|
| -(symlink to ../wlan-module-load.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20190628074406.17.g8386a39.tar.bz2/sparse/lib/systemd/system/multi-user.target.wants/zramswap.service
^
|
| -(symlink to ../zramswap.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/droid-config-@DEVICE@.spec.template
^
|
| @@ -10,14 +10,17 @@
# Community HW adaptations need this
%define community_adaptation 1
-# Sailfish OS is considered to-scale, if in app grid you get 4-in-a-row icons
-# and 2x2 or 3x3 covers when up-to-4 or 5-or-more apps are open respectively.
+# Sailfish OS is considered to-scale, if in the App Grid you get 4-in-a-row icons,
+# and 2-in-a-row or 3-in-a-row app covers in the Home Screen, depending on
+# how many apps are open.
# For 4-5.5" device screen sizes of 16:9 ratio, use this formula (hold portrait):
# pixel_ratio = 4.5/DiagonalDisplaySizeInches * HorizontalDisplayResolution/540
# Other screen sizes and ratios will require more trial-and-error.
%define pixel_ratio 1.0
%include droid-configs-device/droid-configs.inc
+%include patterns/patterns-sailfish-device-adaptation-@DEVICE@.inc
+%include patterns/patterns-sailfish-device-configuration-@DEVICE@.inc
# IMPORTANT if you want to comment out any macros in your .spec, delete the %
# sign, otherwise they will remain defined! E.g.:
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -16,16 +16,12 @@
# Device capabilities:
# remove_modem: set this if your device has no modem (e.g. a WiFi-only tablet)
# remove_bluetooth: set this if your device does not have a Bluetooth chip
-# pixel_ratio: UI scaling factor, choose from 1.0, 1.5, 2.0. Any other value will
-# default the icon pack to 1.0 resolution (it is a bug)!
-# Read more on ways to do-it-together: https://bugs.nemomobile.org/show_bug.cgi?id=814
-# WARNING: pixel_ratio is experimental, and not yet ready for proper UI scalability
-# tests! Please do not test/port your apps to other form factors for the time being.
+# pixel_ratio: UI scaling factor. Calc shown in droid-config-@DEVICE@.spec.template
# Ratio examples:
# Jolla1: 1.0
# Jolla Tablet: 1.5
# Nexus 5: 2.0
-# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0)
+# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25)
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
@@ -63,6 +59,12 @@
%define rpm_vendor %{vendor}
%endif
+%if 0%{?android_version_major:1}
+# If defined also use android version specfic sparse
+# Supersedes the base sparse and is superseded by device specific sparse
+%define dcd_sparse_android_version_major droid-configs-device/sparse-%{android_version_major}
+%endif
+
%define board_mapping_dir %{_datadir}/ssu/board-mappings.d
%define board_mapping_file %{board_mapping_dir}/05-%{rpm_vendor}-%{rpm_device}.ini
@@ -70,14 +72,21 @@
Provides: droid-config
Summary: Config packages for Droid HAL adaptations
Version: 1
+%if 0%{?_obs_build_project:1}
Release: 1
-Group: Configs
+%else
+%define rel_date %(date +'%%Y%%m%%d%%H%%M')
+Release: %{rel_date}
+%endif
License: GPLv2
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: ssu-kickstart-configuration-jolla
+BuildRequires: ssu-kickstart-configuration
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
+BuildRequires: sed
+Requires: sed
+Requires: droid-hal
%if 0%{?community_adaptation:1}
# because it provides one ssu feature, do:
Requires: community-adaptation
@@ -152,7 +161,7 @@
%package kickstart-configuration
Summary: Kickstart configuration for %{rpm_device}
Provides: droid-config-kickstart-configuration
-Requires: ssu-kickstart-configuration-jolla
+Requires: ssu-kickstart-configuration
Provides: droid-hal-kickstart-configuration
# the %{name} contains ssu.ini file which is needed to build kickstarts
Requires: %{name} = %{version}-%{release}
@@ -187,7 +196,6 @@
%package sailfish
Provides: droid-config-sailfish
Provides: theme-configs
-Group: System
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: oneshot
@@ -201,7 +209,6 @@
%package flashing
Provides: droid-config-flashing
-Group: System
# Sparse image flashing support for flash-partition
Requires: droid-hal-tools
Summary: On device flashing files for %{rpm_device} hw
@@ -214,7 +221,6 @@
%if 0%{?out_of_image_files:1}
%package out-of-image-files
-Group: System
BuildArch: noarch
Summary: Files that are used for flashing and are not needed on device.
@@ -230,8 +236,6 @@
%package bluez4
Summary: %{rpm_device} packages for BlueZ 4
Conflicts: droid-config-%{rpm_device}-bluez5
-Requires: %{name} = %{version}-%{release}
-Requires: %{name} = %{version}
Provides: %{rpm_device}-bluez-configs
Requires: bluez
@@ -260,25 +264,29 @@
%package bluez5
Summary: %{rpm_device} packages for BlueZ 5
Conflicts: droid-config-%{rpm_device}-bluez4
-Requires: %{name} = %{version}-%{release}
-Requires: %{name} = %{version}
Provides: %{rpm_device}-bluez-configs
Requires: bluez5
Conflicts: bluez
+Obsoletes: bluez
Requires: bluez5-libs
Conflicts: bluez-libs
+Obsoletes: bluez-libs
Requires: bluez5-obexd
Conflicts: obexd
+Obsoletes: obexd
Requires: kf5bluezqt-bluez5
Conflicts: kf5bluezqt-bluez4
+Obsoletes: kf5bluezqt-bluez4
+Obsoletes: kf5bluezqt-bluez4-declarative
Provides: bluez5-configs
Conflicts: bluez-configs
Obsoletes: bluez-configs-sailfish
+Obsoletes: bluez-configs-mer
%description bluez5
%{summary}.
@@ -292,6 +300,12 @@
%setup -q -n %{name}-%{version}
%endif
+%if 0%{?android_version_major:1}
+# If defined also use android version specfic sparse
+# Supersedes the base sparse and is superseded by device specific sparse
+case %{android_version_major} in 8|9|10) : ;; *) echo unsupported android_version_major; exit 1; esac
+%endif
+
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}
@@ -302,13 +316,49 @@
mkdir -p tmp/
echo "%defattr(-,root,root,-)" > tmp/droid-config.files
-# Prefer files from sparse/ in the HA specific
-# area over sparse/ in the dcd area
+# On 64-bit ARM certain subdirs should not be moved to lib64 but kept under lib.
+# Algorithm below autodetects cases under sparse/ so adaptations do not have to
+# make any changes to their trees when going from armv7hl to aarch64.
+do_not_move_to_lib64=(
+ "firmware"
+ "modules"
+ "startup"
+ "systemd/system"
+ "systemd/user"
+ "tmpfiles.d"
+ "udev"
+ )
copy_files_from() {
config_dir=$1
if [ -d $config_dir ]; then
- (cd $config_dir; find . \( -type f -o -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
- cp -Rf $config_dir/* $RPM_BUILD_ROOT/
+ olddir=$PWD
+ cd $config_dir
+ for f in $(find . \( -type f -o -type l \) -print); do
+ dst=$(echo $f | sed 's/^.//')
+ if echo $dst | grep -qE "^/usr/lib/|^/lib/"; then
+ move_to_lib64=true
+ for stay_in_lib in "${do_not_move_to_lib64[@]}"; do
+ if echo $dst | grep -qE "^/usr/lib/$stay_in_lib/|^/lib/$stay_in_lib/"; then
+ move_to_lib64=false
+ break
+ fi
+ done
+ if [ "$move_to_lib64" = true ]; then
+ if echo $dst | grep -q "^/usr/lib/"; then
+ dst=$(echo $dst | sed 's /usr/lib/ %{_libdir}/ ')
+ else
+ dst=$(echo $dst | sed 's /lib/ /%{_lib}/ ')
+ fi
+ fi
+ fi
+ dstdir=$RPM_BUILD_ROOT$(dirname $dst)
+ if [ ! -d $dstdir ]; then
+ mkdir -p $dstdir
+ fi
+ cp -Pv $f $dstdir
+ echo $dst >> $olddir/tmp/droid-config.files
+ done
+ cd - >/dev/null
fi
}
@@ -342,14 +392,25 @@
# Copy from common; erase any we don't want; overlay from device
# specific sparse/ :
copy_files_from %{dcd_path}/%{dcd_sparse}
+%if 0%{?dcd_sparse_android_version_major:1}
+copy_files_from %{dcd_path}/%{dcd_sparse_android_version_major}
+%endif
delete_files tmp/droid-config.files delete_file.list 1
copy_files_from %{dcd_path}/sparse
+%if 0%{?dcd_sparse_android_version_major:1}
+if [ -e droid-config-device/delete_file_android_version_major_%{android_version_major}.list ] ; then
+ delete_files tmp/droid-config.files \
+ droid-config-device/delete_file_android_version_major_%{android_version_major}.list
+fi
+%endif
delete_files tmp/droid-config.files delete_file_%{rpm_device}.list 1
# This add %config to %files section for files from rpm-config-files.files
config_files tmp/droid-config.files rpm-config-files.files
OFONONOPLUGIN=$RPM_BUILD_ROOT/var/lib/environment/ofono/noplugin.conf
+if [ -e $OFONONOPLUGIN ]; then
+
%if 0%{?have_modem:1}
# DO NOT MODIFY THE "OFONO_MODEM_DEFAULT_PLUGINS" SET! If you do, you will break
# modems on other devices! If you need to introduce or remove a plugin,
@@ -377,6 +438,8 @@
done)
%endif
+fi
+
# Delete files from droid-config.files which are packaged in main spec file
if [ -e packaged-in-main-spec.files ]; then
delete_files tmp/droid-config.files packaged-in-main-spec.files 0
@@ -466,17 +529,29 @@
%endif
%if 0%{?community_adaptation:1}
-# Community ports have their adaptation repos on http://build.merproject.org
-# Until we figure out how ssu works, we'll prevent the default adaptation0 from being created...
-sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/*.ini
-# ...and make a separate adaptation repo for community:
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
-sed -e 's|@DEVICE@|%{rpm_device}|g' \
- -e 's|@VENDOR@|%{rpm_vendor}|g' \
- %{_datadir}/community-adaptation/adaptation-community.ini.in \
- >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
+if [ ! "$(ls -A %{dcd_path}/sparse/%{_datadir}/ssu/repos.d 2> /dev/null)" ]; then
+ # Community ports that do not override repos in ssu/repos.d are catered by
+ # the community-adaptation package.
+ # Prevent the default adaptation0 from being created:
+ sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/*.ini
+ # Make a separate adaptation repo for community:
+ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
+ sed -e 's|@DEVICE@|%{rpm_device}|g' \
+ -e 's|@VENDOR@|%{rpm_vendor}|g' \
+ %{_datadir}/community-adaptation/adaptation-community.ini.in \
+ >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
+ echo "%{_datadir}/ssu/features.d/adaptation-community.ini" >> tmp/droid-config.files
+fi
+%endif
+
+%if 0%{!?lvm_root_size:1}
+%define lvm_root_size 2500
%endif
+if [ -f %{dcd_path}/kickstart/part/%{rpm_device} ]; then
+ sed --in-place 's|@LVM_ROOT_PART_SIZE@|%{lvm_root_size}|' %{dcd_path}/kickstart/part/%{rpm_device}
+fi
+
# Copy kickstart packs (for %%{rpm_device}-kickstart-configuration)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}
DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris
@@ -495,23 +570,34 @@
cp -rf %{dcd_path}/kickstart/* $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/
fi
-# if we are building on Mer OBS or locally, make a domain=sales .ks
-# so it works for HADK users:
-%define disturl_subst %(echo %{disturl} | grep jollamobile.com)
-%if "%{disturl_subst}" == ""
- echo "Setting domain to sales"
- %define ssu_override domain=sales
-%else
- echo "Setting domain to jolla"
- %define ssu_override domain=jolla
+# Do not set ssu_override if it is already defined
+%if 0%{!?ssu_override:1}
+ # if we are building on Mer OBS or locally, make a domain=sales .ks
+ # so it works for HADK users:
+ %define disturl_subst %(echo %{disturl} | grep jollamobile.com)
+ %if "%{disturl_subst}" == ""
+ echo "Setting domain to sales"
+ %define ssu_override domain=sales
+ %else
+ echo "Setting domain to jolla"
+ %define ssu_override domain=jolla
+ %endif
%endif
-# build rnd kickstarts on devel level, release kickstarts on all other levels
-%if 0%{?qa_stage_devel:1}
+%if 0%{?_obs_build_project:1}
+# build rnd kickstarts on devel and branch_devel level, release kickstarts on all other levels
+%if 0%{?qa_stage_devel:1} || 0%{?qa_stage_branch_devel:1}
KS_LEVELS=true
%else
KS_LEVELS=false
%endif
+%else
+ if ssu s 2>/dev/null | grep -q "Release (rnd): latest (devel)"; then
+ KS_LEVELS=true
+ else
+ KS_LEVELS=false
+ fi
+%endif
# build variant ks files if name file exist
%if 0%{?variant_name_list:1}
@@ -528,12 +614,12 @@
%endif
# Preinit plugins
-ln -s /bin/false $RPM_BUILD_ROOT%{_libdir}/startup/preinit/is_total_erase_supported
+ln -s /bin/false $RPM_BUILD_ROOT%{_prefix}/lib/startup/preinit/is_total_erase_supported
# Create keyboard map file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps
-/usr/lib/qt5/bin/kmap2qmap %{dcd_common}/configs/droid.kmap %{dcd_common}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap
-/usr/lib/qt5/bin/kmap2qmap %{dcd_path}/configs/droid.kmap %{dcd_path}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap || true
+%{_libdir}/qt5/bin/kmap2qmap %{dcd_common}/configs/droid.kmap %{dcd_common}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap
+%{_libdir}/qt5/bin/kmap2qmap %{dcd_path}/configs/droid.kmap %{dcd_path}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap || true
clean_files() { sed 's_^./_/_'; }
@@ -558,8 +644,17 @@
################################################################
%post
# Force an update of ssu repositories
-touch %{board_mapping_dir}/* || :
-touch %{_datadir}/ssu/features.d/* || :
+touch %{board_mapping_dir}/* &> /dev/null || :
+touch %{_datadir}/ssu/features.d/* &> /dev/null || :
+
+%if 0%{?community_adaptation:1}
+if [ "$(find /%{_datadir}/ssu/repos.d -maxdepth 1 -type f -not -name 10-jolla.ini 2> /dev/null)" ] \
+ && ssu lr | grep -q adaptation-community; then
+ # Switching to a self-hosted removes adaptation-community*.ini files
+ # but those feature repos will still exist until we clear its cache:
+ rm -f /var/cache/ssu/features.ini
+fi
+%endif
# To add additional post scripts, one can define those as part
# of additional_post_scripts macro.
@@ -576,9 +671,6 @@
%{board_mapping_file}
%endif
%{_datadir}/qt5/keymaps/droid.qmap
-%if 0%{?community_adaptation:1}
-%{_datadir}/ssu/features.d/adaptation-community.ini
-%endif
%files ssu-kickstarts
%defattr(-,root,root,-)
@@ -596,7 +688,7 @@
%files preinit-plugin
%defattr(-,root,root,-)
-%{_libdir}/startup/preinit/*
+%{_prefix}/lib/startup/preinit/*
%files pulseaudio-settings -f tmp/pulseaudio-settings.files
%defattr(644,root,root,-)
@@ -626,3 +718,23 @@
%files bluez5 -f tmp/bluez5.files
%defattr(644,root,root,-)
%endif
+
+
+%package -n patterns-sailfish-device-configuration-common-%{rpm_device}
+Summary: Jolla Configuration common
+Requires: patterns-sailfish-applications
+Requires: patterns-sailfish-ui
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+Recommends: csd
+# All 3 requires above will be replaced with new meta-package
+# "patterns-sailfish-device-configuration-common" that will become available in
+# the next Sailfish OS release after 3.4.0
+
+%description -n patterns-sailfish-device-configuration-common-%{rpm_device}
+Pattern with packages for common HW configurations
+
+%files -n patterns-sailfish-device-configuration-common-%{rpm_device}
+
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/helpers/migrate_patterns.sh
^
|
| @@ -0,0 +1,108 @@
+#!/bin/bash
+
+METAPKG_DIR=patterns
+PATTERNS_DIR=patterns
+SPEC_DIR=rpm
+
+function migrate {
+ pattern=$1
+ pattername=$(basename "$pattern" .yaml)
+ remove_prefix="jolla-"
+ meta=${pattername#"$remove_prefix"}
+ meta=patterns-sailfish-device-${meta#"hw-"}
+ metaspec=$meta.inc
+ device=${meta##*-}
+
+ if [ -f $METAPKG_DIR/"$metaspec" ]; then
+ echo "Already migrated: $PATTERNS_DIR/$pattern -> $metaspec"
+ return
+ fi
+
+ {
+ echo "%package -n $meta"
+ sed -n '/Summary:/p' $PATTERNS_DIR/"$pattern"
+ awk '/Requires:/{flag=1;next}/Summary:/{flag=0}flag' $PATTERNS_DIR/"$pattern"
+ } >> $METAPKG_DIR/"$metaspec"
+
+ sed -i 's/- /Requires: /g' $METAPKG_DIR/"$metaspec"
+ sed -i 's/pattern://g' $METAPKG_DIR/"$metaspec"
+ sed -i 's/Requires: jolla-hw-adaptation-/Requires: patterns-sailfish-device-adaptation-/g' $METAPKG_DIR/"$metaspec"
+ sed -i "/^Requires: patterns-sailfish-device-adaptation-/i Requires: patterns-sailfish-device-configuration-common-$device" $METAPKG_DIR/"$metaspec"
+ sed -i '/^Requires: patterns-sailfish-applications/d' $METAPKG_DIR/"$metaspec"
+ sed -i '/^Requires: patterns-sailfish-ui/d' $METAPKG_DIR/"$metaspec"
+ sed -i '/^Requires: csd/d' $METAPKG_DIR/"$metaspec"
+ sed -i 's/Requires: jolla-configuration-/Requires: patterns-sailfish-device-configuration-/g' $METAPKG_DIR/"$metaspec"
+ sed -i 's/Requires: jolla-developer-mode$/Recommends: jolla-developer-mode/g' $METAPKG_DIR/"$metaspec"
+ sed -i "s/@ICON_RES@/%{icon_res}/" $METAPKG_DIR/"$metaspec"
+
+ {
+ echo "%description -n $meta"
+ sed -n -e 's/^Description: //p' $PATTERNS_DIR/"$pattern"
+ echo
+ echo "%files -n $meta"
+ } >> $METAPKG_DIR/"$metaspec"
+
+ # scan all .spec files, some of them might have differing rpm_device and device vars
+ grep -l "device\s*$device\s*$" $SPEC_DIR/droid-config-*.spec | while IFS= read -r f; do
+ if ! grep -q "%include $METAPKG_DIR\/$metaspec" "$f"; then
+ # include meta-packages to the .spec
+ sed -i "/^%include droid-configs-device\/droid-configs.inc/a %include $METAPKG_DIR\/$metaspec" "$f"
+ fi
+ done
+
+ if [[ $meta == patterns-sailfish-device-adaptation-* ]]; then
+ rm $PATTERNS_DIR/"$pattern"
+ sed -i "/$pattername.xml$/d" delete_pattern_*.list 2>/dev/null
+ elif [[ $meta == patterns-sailfish-device-*configuration-* ]]; then
+ # Replace pattern contents with the main meta-package
+ tmpmeta=$(mktemp)
+ awk -v name=$meta '
+ BEGIN {p=1}
+ /^Requires:/ {print;system("echo - "name"; echo");p=0}
+ /^Summary:/ {p=1}
+ p' $PATTERNS_DIR/"$pattern" > $tmpmeta
+ mv $tmpmeta $PATTERNS_DIR/"$pattern"
+ fi
+
+ echo "Migrated successfully: $PATTERNS_DIR/$pattern -> $metaspec"
+}
+
+if [ ! -d droid-configs-device/helpers ]; then
+ echo "$0: launch this script from the \$ANDROID_ROOT/hybris/droid-configs directory"
+ exit 1
+fi
+
+for pattern in "$PATTERNS_DIR"/*.yaml; do
+ while IFS= read -r f; do
+ if (echo "$f" | grep -q "^- pattern:\s*sailfish-porter-tools"); then
+ echo "Please replace '- pattern:sailfish-porter-tools' with:"
+ echo "- patterns-sailfish-rnd"
+ echo "# dev-tools pattern will be fixed in the next release"
+ echo "# for now we'll use its 'exploded' version:"
+ echo "#- patterns-sailfish-dev-tools"
+ echo "- jolla-developer-mode"
+ echo "- strace"
+ echo "- gdb"
+ echo "- gdb-gdbserver"
+ echo "- vim-enhanced"
+ echo "- less"
+ echo "- valgrind"
+ echo "- lipstick-qt5-tools"
+ echo "- libhybris-tests"
+ echo "- busybox-static"
+ echo "- openssh-server"
+ echo "- zypper"
+ echo
+ echo "and re-run this script"
+ exit 1
+ fi
+ if ! (echo "$f" | grep -q "^- pattern:\s*jolla-hw-adaptation-"); then
+ echo "File $pattern contains patterns that cannot be migrated automatically. Aborting."
+ exit 1
+ fi
+ done < <(grep "^- pattern:" "$pattern")
+done
+
+for pattern in "$PATTERNS_DIR"/*.yaml; do
+ migrate "${pattern##*/}"
+done
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
| @@ -1,21 +1,6 @@
Description: Pattern with packages for common debugging tools used by porters
Name: sailfish-porter-tools
Requires:
-- jolla-developer-mode
-- sailfishsilica-qt5-demos
-- libhybris-tests
-
-- busybox-static
-- net-tools
-- openssh-clients
-- openssh-server
-- vim-enhanced
-- zypper
-- strace
-
-# jolla-rnd-device will enable usb-moded even when UI is not yet
-# brought up (useful during development, available since update10)
-- jolla-rnd-device
+- patterns-sailfish-device-porter-tools
Summary: Sailfish OS Porter Tools
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
| @@ -1,38 +1,6 @@
Description: Pattern with packages for @DEVICE@ configurations
Name: jolla-configuration-@DEVICE@
Requires:
-- pattern:jolla-hw-adaptation-@DEVICE@
-
-- patterns-sailfish-applications
-- patterns-sailfish-ui
-# For devices with cellular modem. Those without one, please comment out:
-- patterns-sailfish-cellular-apps
-# Early stages of porting benefit from these:
-- pattern:sailfish-porter-tools
-
-- sailfish-content-graphics-z@ICON_RES@
-
-# For multi-SIM devices
-#- jolla-settings-networking-multisim
-
-# Introduced starting Sailfish OS 2.0.4.x:
-# 3rd party accounts like Twitter, VK, cloud services, etc
-- jolla-settings-accounts-extensions-3rd-party-all
-
-# Introduced starting Sailfish OS 2.1.1.26
-# Required for Jolla Store Access
-- patterns-sailfish-consumer-generic
-
-# For Mozilla location services (online)
-- geoclue-provider-mlsdb
-
-# Sailfish OS CSD tool for hardware testing
-# needs some configuration to get all features working
-- csd
-
-# Devices with 2G or more memory should also include this booster
-# to improve camera startup times and the like
-#- mapplauncherd-booster-silica-qt5-media
+- patterns-sailfish-device-configuration-@DEVICE@
Summary: Jolla Configuration @DEVICE@
-
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-adaptation-@DEVICE@.inc
^
|
| @@ -0,0 +1,81 @@
+%package -n patterns-sailfish-device-adaptation-@DEVICE@
+Summary: Jolla HW Adaptation @DEVICE@
+Requires: droid-hal-@DEVICE@
+Requires: droid-hal-@DEVICE@-img-boot
+Requires: droid-hal-@DEVICE@-kernel-modules
+Requires: droid-config-@DEVICE@-sailfish
+Requires: droid-config-@DEVICE@-pulseaudio-settings
+Requires: droid-config-@DEVICE@-policy-settings
+Requires: droid-config-@DEVICE@-preinit-plugin
+Requires: droid-config-@DEVICE@-flashing
+Requires: droid-config-@DEVICE@-bluez5
+Requires: droid-hal-version-@DEVICE@
+
+# Hybris packages
+Requires: libhybris-libEGL
+Requires: libhybris-libGLESv2
+Requires: libhybris-libwayland-egl
+
+# Sensors
+Requires: hybris-libsensorfw-qt5
+
+# Vibra
+Requires: ngfd-plugin-native-vibrator
+Requires: qt5-feedback-haptics-native-vibrator
+
+# Needed for /dev/touchscreen symlink
+Requires: qt5-plugin-generic-evdev
+
+Requires: pulseaudio-modules-droid
+Requires: pulseaudio-modules-droid-hidl
+
+# The -dummy-af is needed for newer devices that run the main
+# audiosystem-passthrough in qti mode (e.g. >=Android 9 Qualcomm),
+# to fix non-responding Camera app and/or voice during a phone call:
+#Requires: audiosystem-passthrough-dummy-af
+
+# for audio recording to work:
+Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
+
+# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
+Requires: qt5-qtwayland-wayland_egl
+Requires: qt5-qpa-hwcomposer-plugin
+Requires: qtscenegraph-adaptation
+
+# For hybris devices with droidmedia, see HADK pdf for more information
+Requires: gstreamer1.0-droid
+Requires: gmp-droid
+
+# This is needed for notification LEDs
+Requires: mce-plugin-libhybris
+
+# USB mode controller
+Requires: usb-moded
+
+# hammerhead, grouper, and maguro use this in scripts, so include for all
+Requires: rfkill
+
+# enable device lock and allow to select untrusted software
+Requires: jolla-devicelock-daemon-encsfa
+
+# Enable home encryption
+#Requires: sailfish-device-encryption
+
+# For GPS
+Requires: geoclue-provider-hybris
+
+# For FM radio on some QCOM devices
+#Requires: qt5-qtmultimedia-plugin-mediaservice-irisradio
+#Requires: jolla-mediaplayer-radio
+
+# NFC support
+# 1. binder plugin requires Android 8 or a newer base
+# 2. pn54x plugin talks directly to pn54x driver
+# These plugins are mutually exclusive, you need to pick one:
+#Requires: nfcd-binder-plugin
+#Requires: nfcd-pn54x-plugin
+
+%description -n patterns-sailfish-device-adaptation-@DEVICE@
+Pattern with packages for @DEVICE@ HW Adaptation
+
+%files -n patterns-sailfish-device-adaptation-@DEVICE@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-configuration-@DEVICE@.inc
^
|
| @@ -0,0 +1,55 @@
+%package -n patterns-sailfish-device-configuration-@DEVICE@
+Summary: Jolla Configuration @DEVICE@
+Requires: patterns-sailfish-device-configuration-common-@DEVICE@
+Requires: patterns-sailfish-device-adaptation-@DEVICE@
+
+# For devices with cellular modem. Those without one, please comment out:
+Requires: patterns-sailfish-cellular-apps
+
+# Early stages of porting benefit from these:
+Requires: patterns-sailfish-rnd
+# dev-tools pattern will be fixed in the next release
+# for now we'll use its 'exploded' version:
+#Requires: patterns-sailfish-dev-tools
+Recommends: jolla-developer-mode
+Requires: strace
+Requires: gdb
+Requires: gdb-gdbserver
+Requires: vim-enhanced
+Requires: less
+Requires: valgrind
+Requires: lipstick-qt5-tools
+Requires: libhybris-tests
+Requires: busybox-static
+Requires: openssh-server
+Requires: zypper
+
+Requires: sailfish-content-graphics-z%{icon_res}
+
+# For multi-SIM devices
+#Requires: jolla-settings-networking-multisim
+
+# For devices which support NFC
+#Requires: jolla-settings-system-nfc
+#Requires: nfcd-dbuslog-plugin
+#Requires: nfcd-mce-plugin
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+Requires: jolla-settings-accounts-extensions-3rd-party-all
+
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+Requires: patterns-sailfish-consumer-generic
+
+# For Mozilla location services (online)
+Requires: geoclue-provider-mlsdb
+
+# Devices with 2G or more memory should also include this booster
+# to improve camera startup times and the like
+#Requires: mapplauncherd-booster-silica-qt5-media
+
+%description -n patterns-sailfish-device-configuration-@DEVICE@
+Pattern with packages for @DEVICE@ configurations
+
+%files -n patterns-sailfish-device-configuration-@DEVICE@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/boot/flashing-README.txt
^
|
| @@ -0,0 +1 @@
+Please refer to https://jolla.com/sailfishxinstall
\ No newline at end of file
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/acdbdata
^
|
| +(symlink to /vendor/etc/acdbdata)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/dconf/db/vendor.d/lipstick-configs.txt
^
|
| @@ -0,0 +1,6 @@
+[desktop/lipstick-jolla-home]
+reboot_warning_on_sim_remove=true
+
+[desktop/lipstick-jolla-home/peekfilter]
+boundaryWidth=48
+pressDelay=800
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/gbinder.conf
^
|
| @@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/gst-droid/gstdroidcodec.conf
^
|
| @@ -0,0 +1,6 @@
+[decoders]
+video/hevc=1
+
+[decoder-quirks]
+video/mp4v-es=use-codec-supplied-height;use-codec-supplied-width
+video/avc=use-codec-supplied-height;use-codec-supplied-width
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/mce/60-fingerprint-sensor.conf
^
|
| @@ -0,0 +1 @@
+/system/osso/dsm/fingerprint/mode=1
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/mce/60-hybris-features.ini
^
|
| @@ -0,0 +1,3 @@
+[FeatureHybris]
+# Keep mce off android hwc2 functionality
+FrameBuffer = false
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/mce/60-proximity-sensor.conf
^
|
| @@ -0,0 +1 @@
+/system/osso/dsm/proximity/on_demand=true
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/ofono/ril_subscription.conf
^
|
| @@ -0,0 +1,37 @@
+# Ofono configuration for Android 9
+
+[Settings]
+#EmptyConfig=false
+#Identity=radio:radio
+#3GLTEHandover=true
+#SetRadioCapability=auto
+
+SetRadioCapability=off
+emptyPinQuery=true
+radioPowerCycle=false
+confirmRadioPowerOn=false
+
+[ril_0]
+transport=binder:name=slot1
+name=slot1
+ecclistFile=/run/ofono/ril.ecclist
+
+#socket=/dev/socket/rild
+#sub=SUB1
+#slot=0
+#timeout=0
+#technologies=all
+#enable4G=true
+#uiccWorkaround=true
+#allowDataReq=auto
+#dataCallFormat=auto
+#dataCallRetryLimit=4
+#dataCallRetryDelay=200
+#remoteHangupReasons=20
+#localHangupReasons=23
+#enableVoicecall=true
+#enableCellBroadcast=true
+#startTimeout=20000
+#legacyImeiQuery=false
+#lteNetworkMode=9
+#networkModeTimeout=20000
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/ofono/ril_subscription.d/dual-sim.conf
^
|
| @@ -0,0 +1,4 @@
+[ril_1]
+transport=binder:name=slot2
+name=slot2
+ecclistFile=/run/ofono/ril.ecclist1
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/pulse/arm_droid_card_custom.pa
^
|
| @@ -0,0 +1,2 @@
+load-module module-droid-card rate=48000 quirks=+unload_call_exit
+load-module module-udev-detect
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/pulse/xpolicy.conf.d/usbaudio.conf
^
|
| +(symlink to usbaudio.conf.disabled)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/pulse/xpolicy.conf.d/voicecall.conf
^
|
| @@ -0,0 +1,7 @@
+# We cannot use input-voice_call port even though
+# it is available, as this results in broken audio.
+# Using whatever normal ports with correct audio
+# source works, so don't do port change.
+[device]
+type = voicecall
+source = droid.input.external@equals:"true"
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/sailfish-fpd/50-settings.ini
^
|
| @@ -0,0 +1,14 @@
+[fpslave]
+template_directory_owner_quirk = system
+template_directory_group_quirk = system
+template_directory_mode_quirk = 0770
+
+fphal_max_fingerprints_quirk = 5
+
+mass_remove_single_notify_quirk = 0
+set_active_group_twice_quirk = 0
+set_active_group_always_quirk = 1
+skip_post_enroll_quirk = 0
+skip_enumerate_quirk = 0
+no_cancel_notification_quirk = 0
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/selinux/config
^
|
| @@ -0,0 +1,3 @@
+SELINUX=permissive
+SELINUXTYPE=minimum
+AUTORELABEL=1
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/contexts/dbus_contexts
^
|
| @@ -0,0 +1,5 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+<selinux>
+</selinux>
+</busconfig>
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/contexts/files/file_contexts
^
|
| +(symlink to /vendor/etc/selinux/vendor_file_contexts)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/policy/policy.30
^
|
| +(symlink to /vendor/etc/selinux/precompiled_sepolicy)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/bin/droid/droid-bootctl.sh
^
|
| @@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Check currentl used boot slot
+SLOT="$(/usr/libexec/droid-hybris/system/bin/bootctl get-current-slot)"
+
+# Check if current slot is marked successful
+/usr/libexec/droid-hybris/system/bin/bootctl is-slot-marked-successful $SLOT 2> /dev/null
+
+if [ $? -ne 0 ]
+then
+ echo "Marking boot as successful"
+ /usr/libexec/droid-hybris/system/bin/bootctl mark-boot-successful 2> /dev/null
+fi
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/bin/droid/droid-hal-early-init.sh
^
|
| @@ -0,0 +1,6 @@
+#!/bin/bash
+
+if ! grep -q hybris /system/etc/ld.config.29.txt; then
+ mount -o bind /usr/libexec/droid-hybris/system/etc/ld.config.29.txt /system/etc/ld.config.29.txt
+fi
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/qt5/plugins/feedback/droid-vibrator-device.ini
^
|
| @@ -0,0 +1,13 @@
+Press = 35
+Release = 33
+PressWeak = 25
+ReleaseWeak = 22
+PressStrong = 45
+ReleaseStrong = 40
+DragStart = 20
+DragDropInZone = 30
+DragDropOutOfZone = 23
+DragCrossBoundary = 25
+Appear = 0
+Disappear = 0
+Move = 0
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/droid-bootctl.service
^
|
| @@ -0,0 +1,10 @@
+[Unit]
+Description=Droid bootctl
+After=start-user-session.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh /usr/bin/droid/droid-bootctl.sh
+
+[Install]
+WantedBy=graphical.target actdead.target
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/droid-hal-init.service
^
|
| @@ -0,0 +1,26 @@
+[Unit]
+Description=droid-hal-init
+Wants=systemd-udev-settle.service
+After=local-fs.target systemd-udev-settle.service systemd-tmpfiles-setup.service
+Before=basic.target network.target bluetooth.service ofono.service sensorfwd.service
+DefaultDependencies=no
+Conflicts=shutdown.target
+# Lets not do Requires= here as that means that this service will restart which leads automatically
+# to broken state as android init can be only started once per boot. If something goes wrong
+# our best hope is that android init doesn't notice that and that the crashing party fixes itself :)
+
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStartPre=-/bin/sh /usr/bin/droid/droid-hal-early-init.sh
+ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh
+Restart=always
+# Lets make sure we don't block minutes in case of errors.
+TimeoutSec=15
+StartLimitInterval=60
+StartLimitBurst=2
+
+[Install]
+WantedBy=graphical.target
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/graphical.target.wants/droid-bootctl.service
^
|
| +(symlink to ../droid-bootctl.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/multi-user.target.wants/wait_for_keymaster.service
^
|
| +(symlink to ../wait_for_keymaster.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/network.target.wants/wifisetup.service
^
|
| +(symlink to ../wifisetup.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/sailfish-unlock-agent.service.d/50-vendor.hwcomposer-2-3.conf
^
|
| @@ -0,0 +1,6 @@
+[Service]
+# stop hwcomposer before unlock ui
+ExecStartPre=-/system/bin/stop vendor.hwcomposer-2-3
+
+# start hwcomposer after unlock ui, but not on upgrade target
+ExecStart=-/bin/sh -c '/usr/bin/test -f /tmp/os-update-running || /system/bin/start vendor.hwcomposer-2-3'
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/sailfish-upgrade-ui.service.d/50-vendor.hwcomposer-2-3.conf
^
|
| @@ -0,0 +1,3 @@
+[Service]
+# make sure unlock-ui has exited before starting upgrade-ui
+ExecStartPre=-/usr/sbin/dummy_compositor --exit-on-enable
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/wait_for_keymaster.service
^
|
| @@ -0,0 +1,14 @@
+[Unit]
+Description=Fingerprint Daemon preinit
+DefaultDependencies=no
+After=droid-hal-init.service
+Before=sailfish-fpd.service
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/system/bin/wait_for_keymaster
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/wifisetup.service
^
|
| @@ -0,0 +1,12 @@
+[Unit]
+Description=wifisetup
+After=droid-hal-init.service
+Before=connman.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/sh -c "echo 1 > /sys/kernel/boot_wlan/boot_wlan"
+
+[Install]
+WantedBy=network.target
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/user/jolla-startupwizard-pre-user-session.service.d/50-vendor.hwcomposer-2-3.conf
^
|
| @@ -0,0 +1,3 @@
+[Service]
+# make unlock ui exit
+ExecStartPre=/usr/sbin/dummy_compositor
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/user/lipstick.service.d/50-vendor.hwcomposer-2-3.conf
^
|
| @@ -0,0 +1,3 @@
+[Service]
+# make unlock ui exit
+ExecStartPre=/usr/sbin/dummy_compositor
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/libexec/droid-hybris/system/etc/init/disabled_services.rc
^
|
| @@ -0,0 +1,29 @@
+service netd netd_HYBRIS_DISABLED
+
+service installd installd_HYBRIS_DISABLED
+
+service cameraserver cameraserver_HYBRIS_DISABLED
+
+service audioserver audioserver_HYBRIS_DISABLED
+
+service media mediaserver_HYBRIS_DISABLED
+
+service update_engine update_engine_HYBRIS_DISABLED
+
+service vendor.audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service_HYBRIS_DISABLED
+
+service lmkd /system/bin/lmkd_HYBRIS_DISABLED
+
+service vold /system/bin/vold_HYBRIS_DISABLED
+
+service wificond /system/bin/wificond_HYBRIS_DISABLED
+
+service storaged /system/bin/storaged_HYBRIS_DISABLED
+
+service surfaceflinger surfaceflinger_HYBRIS_DISABLED
+
+service bootanim /system/bin/bootanimation_HYBRIS_DISABLED
+
+service vendor.usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service
+
+service vendor.vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service_HYBRIS_DISABLED
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/libexec/droid-hybris/system/etc/init/ecclist.rc
^
|
| @@ -0,0 +1,12 @@
+on post-fs
+ # Create directory for ofono ecc files
+ mkdir /run/ofono 0755 root root
+
+# Ofono tracks these files to sync emergency numbers with the modem
+on property:ril.ecclist=*
+ write /run/ofono/ril.ecclist ${ril.ecclist}
+ chmod 0644 /run/ofono/ril.ecclist
+
+on property:ril.ecclist1=*
+ write /run/ofono/ril.ecclist1 ${ril.ecclist1}
+ chmod 0644 /run/ofono/ril.ecclist1
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/libexec/droid-hybris/system/etc/ld.config.29.txt
^
|
| @@ -0,0 +1,678 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Bionic loader config file.
+#
+
+# Don't change the order here. The first pattern that matches with the
+# absolute path of an executable is selected.
+dir.system = /system/bin/
+dir.system = /system/xbin/
+dir.system = /product/bin/
+
+dir.vendor = /odm/bin/
+dir.vendor = /vendor/bin/
+dir.vendor = /data/nativetest/odm
+dir.vendor = /data/nativetest64/odm
+dir.vendor = /data/benchmarktest/odm
+dir.vendor = /data/benchmarktest64/odm
+dir.vendor = /data/nativetest/vendor
+dir.vendor = /data/nativetest64/vendor
+dir.vendor = /data/benchmarktest/vendor
+dir.vendor = /data/benchmarktest64/vendor
+
+dir.unrestricted = /data/nativetest/unrestricted
+dir.unrestricted = /data/nativetest64/unrestricted
+
+# TODO(b/123864775): Ensure tests are run from /data/nativetest{,64} or (if
+# necessary) the unrestricted subdirs above. Then clean this up.
+dir.unrestricted = /data/local/tmp
+
+dir.postinstall = /postinstall
+
+# Fallback entry to provide APEX namespace lookups for binaries anywhere else.
+# This must be last.
+dir.system = /data
+
+[system]
+additional.namespaces = runtime,conscrypt,media,resolv,sphal,vndk,rs
+
+###############################################################################
+# "default" namespace
+#
+# Framework-side code runs in this namespace. Libs from /vendor partition
+# can't be loaded in this namespace.
+###############################################################################
+namespace.default.isolated = true
+
+namespace.default.search.paths = /system/${LIB}
+namespace.default.search.paths += /product/${LIB}
+
+# We can't have entire /system/${LIB} as permitted paths because doing so
+# makes it possible to load libs in /system/${LIB}/vndk* directories by
+# their absolute paths (e.g. dlopen("/system/lib/vndk/libbase.so");).
+# VNDK libs are built with previous versions of Android and thus must not be
+# loaded into this namespace where libs built with the current version of
+# Android are loaded. Mixing the two types of libs in the same namespace can
+# cause unexpected problem.
+namespace.default.permitted.paths = /system/${LIB}/drm
+namespace.default.permitted.paths += /system/${LIB}/extractors
+namespace.default.permitted.paths += /system/${LIB}/hw
+namespace.default.permitted.paths += /product/${LIB}
+# These are where odex files are located. libart has to be able to dlopen the files
+namespace.default.permitted.paths += /system/framework
+namespace.default.permitted.paths += /system/app
+namespace.default.permitted.paths += /system/priv-app
+namespace.default.permitted.paths += /vendor/framework
+namespace.default.permitted.paths += /vendor/app
+namespace.default.permitted.paths += /vendor/priv-app
+namespace.default.permitted.paths += /system/vendor/framework
+namespace.default.permitted.paths += /system/vendor/app
+namespace.default.permitted.paths += /system/vendor/priv-app
+namespace.default.permitted.paths += /odm/framework
+namespace.default.permitted.paths += /odm/app
+namespace.default.permitted.paths += /odm/priv-app
+namespace.default.permitted.paths += /oem/app
+namespace.default.permitted.paths += /product/framework
+namespace.default.permitted.paths += /product/app
+namespace.default.permitted.paths += /product/priv-app
+namespace.default.permitted.paths += /data
+namespace.default.permitted.paths += /mnt/expand
+namespace.default.permitted.paths += /apex/com.android.runtime/${LIB}/bionic
+namespace.default.permitted.paths += /system/${LIB}/bootstrap
+namespace.default.permitted.paths += /usr/libexec/droid-hybris/system/${LIB}
+
+namespace.default.asan.search.paths = /data/asan/system/${LIB}
+namespace.default.asan.search.paths += /system/${LIB}
+namespace.default.asan.search.paths += /data/asan/product/${LIB}
+namespace.default.asan.search.paths += /product/${LIB}
+
+namespace.default.asan.permitted.paths = /data
+namespace.default.asan.permitted.paths += /system/${LIB}/drm
+namespace.default.asan.permitted.paths += /system/${LIB}/extractors
+namespace.default.asan.permitted.paths += /system/${LIB}/hw
+namespace.default.asan.permitted.paths += /system/framework
+namespace.default.asan.permitted.paths += /system/app
+namespace.default.asan.permitted.paths += /system/priv-app
+namespace.default.asan.permitted.paths += /vendor/framework
+namespace.default.asan.permitted.paths += /vendor/app
+namespace.default.asan.permitted.paths += /vendor/priv-app
+namespace.default.asan.permitted.paths += /system/vendor/framework
+namespace.default.asan.permitted.paths += /system/vendor/app
+namespace.default.asan.permitted.paths += /system/vendor/priv-app
+namespace.default.asan.permitted.paths += /odm/framework
+namespace.default.asan.permitted.paths += /odm/app
+namespace.default.asan.permitted.paths += /odm/priv-app
+namespace.default.asan.permitted.paths += /oem/app
+namespace.default.asan.permitted.paths += /product/${LIB}
+namespace.default.asan.permitted.paths += /product/framework
+namespace.default.asan.permitted.paths += /product/app
+namespace.default.asan.permitted.paths += /product/priv-app
+namespace.default.asan.permitted.paths += /mnt/expand
+namespace.default.asan.permitted.paths += /apex/com.android.runtime/${LIB}/bionic
+namespace.default.asan.permitted.paths += /system/${LIB}/bootstrap
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+# If a shared library or an executable requests a shared library that
+# cannot be loaded into the default namespace, the dynamic linker tries
+# to load the shared library from the runtime namespace. And then, if the
+# shared library cannot be loaded from the runtime namespace either, the
+# dynamic linker tries to load the shared library from the resolv namespace.
+# Finally, if all attempts fail, the dynamic linker returns an error.
+namespace.default.links = runtime,resolv
+# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
+# libart.
+namespace.default.visible = true
+namespace.default.link.runtime.shared_libs = libdexfile_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.default.link.runtime.shared_libs += libicui18n.so
+namespace.default.link.runtime.shared_libs += libicuuc.so
+namespace.default.link.runtime.shared_libs += libnativebridge.so
+namespace.default.link.runtime.shared_libs += libnativehelper.so
+namespace.default.link.runtime.shared_libs += libnativeloader.so
+namespace.default.link.runtime.shared_libs += libandroidicu.so
+
+# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
+namespace.default.link.runtime.shared_libs += libpac.so
+namespace.default.link.runtime.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+# When libnetd_resolv.so can't be found in the default namespace, search for it
+# in the resolv namespace. Don't allow any other libraries from the resolv namespace
+# to be loaded in the default namespace.
+namespace.default.link.resolv.shared_libs = libnetd_resolv.so
+
+###############################################################################
+# "runtime" APEX namespace
+#
+# This namespace exposes externally accessible libraries from the Runtime APEX.
+###############################################################################
+namespace.runtime.isolated = true
+namespace.runtime.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.links = default
+# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
+# when it exists.
+namespace.runtime.link.default.allow_all_shared_libs = true
+
+###############################################################################
+# "media" APEX namespace
+#
+# This namespace is for libraries within the media APEX.
+###############################################################################
+namespace.media.isolated = true
+namespace.media.visible = true
+
+namespace.media.search.paths = /apex/com.android.media/${LIB}
+namespace.media.asan.search.paths = /apex/com.android.media/${LIB}
+
+namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors
+namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors
+
+namespace.media.links = default
+namespace.media.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.media.link.default.shared_libs += libbinder_ndk.so
+namespace.media.link.default.shared_libs += libcgrouprc.so
+namespace.media.link.default.shared_libs += libmediametrics.so
+namespace.media.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+###############################################################################
+# "conscrypt" APEX namespace
+#
+# This namespace is for libraries within the conscrypt APEX.
+###############################################################################
+namespace.conscrypt.isolated = true
+namespace.conscrypt.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.links = runtime,default
+namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
+namespace.conscrypt.link.default.shared_libs = libc.so
+namespace.conscrypt.link.default.shared_libs += libm.so
+namespace.conscrypt.link.default.shared_libs += libdl.so
+namespace.conscrypt.link.default.shared_libs += liblog.so
+
+###############################################################################
+# "resolv" APEX namespace
+#
+# This namespace is for libraries within the resolv APEX.
+###############################################################################
+namespace.resolv.isolated = true
+namespace.resolv.visible = true
+
+namespace.resolv.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.asan.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.links = default
+namespace.resolv.link.default.shared_libs = libc.so
+namespace.resolv.link.default.shared_libs += libcgrouprc.so
+namespace.resolv.link.default.shared_libs += libm.so
+namespace.resolv.link.default.shared_libs += libdl.so
+namespace.resolv.link.default.shared_libs += libbinder_ndk.so
+namespace.resolv.link.default.shared_libs += liblog.so
+namespace.resolv.link.default.shared_libs += libvndksupport.so
+
+###############################################################################
+# "sphal" namespace
+#
+# SP-HAL(Sameprocess-HAL)s are the only vendor libraries that are allowed to be
+# loaded inside system processes. libEGL_<chipset>.so, libGLESv2_<chipset>.so,
+# android.hardware.graphics.mapper@2.0-impl.so, etc are SP-HALs.
+#
+# This namespace is exclusivly for SP-HALs. When the framework tries to dynami-
+# cally load SP-HALs, android_dlopen_ext() is used to explicitly specifying
+# that they should be searched and loaded from this namespace.
+#
+# Note that there is no link from the default namespace to this namespace.
+###############################################################################
+namespace.sphal.isolated = true
+namespace.sphal.visible = true
+
+namespace.sphal.search.paths = /odm/${LIB}
+namespace.sphal.search.paths += /vendor/${LIB}
+namespace.sphal.search.paths += /vendor/${LIB}/hw
+
+namespace.sphal.permitted.paths = /odm/${LIB}
+namespace.sphal.permitted.paths += /vendor/${LIB}
+namespace.sphal.permitted.paths += /system/vendor/${LIB}
+
+namespace.sphal.asan.search.paths = /data/asan/odm/${LIB}
+namespace.sphal.asan.search.paths += /odm/${LIB}
+namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.sphal.asan.search.paths += /vendor/${LIB}
+
+namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB}
+namespace.sphal.asan.permitted.paths += /odm/${LIB}
+namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}
+namespace.sphal.asan.permitted.paths += /vendor/${LIB}
+
+# Once in this namespace, access to libraries in /system/lib is restricted. Only
+# libs listed here can be used. Order is important here as the namespaces are
+# tried in this order. rs should be before vndk because both are capable
+# of loading libRS_internal.so
+namespace.sphal.links = rs,default,vndk
+
+# Renderscript gets separate namespace
+namespace.sphal.link.rs.shared_libs = libRS_internal.so
+
+namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.sphal.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
+
+###############################################################################
+# "rs" namespace
+#
+# This namespace is exclusively for Renderscript internal libraries.
+# This namespace has slightly looser restriction than the vndk namespace because
+# of the genuine characteristics of Renderscript; /data is in the permitted path
+# to load the compiled *.so file and libmediandk.so can be used here.
+###############################################################################
+namespace.rs.isolated = true
+namespace.rs.visible = true
+
+namespace.rs.search.paths = /odm/${LIB}/vndk-sp
+namespace.rs.search.paths += /vendor/${LIB}/vndk-sp
+namespace.rs.search.paths += /system/${LIB}/vndk-sp-29
+namespace.rs.search.paths += /odm/${LIB}
+namespace.rs.search.paths += /vendor/${LIB}
+
+namespace.rs.permitted.paths = /odm/${LIB}
+namespace.rs.permitted.paths += /vendor/${LIB}
+namespace.rs.permitted.paths += /system/vendor/${LIB}
+namespace.rs.permitted.paths += /data
+
+namespace.rs.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp
+namespace.rs.asan.search.paths += /odm/${LIB}/vndk-sp
+namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
+namespace.rs.asan.search.paths += /vendor/${LIB}/vndk-sp
+namespace.rs.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-29
+namespace.rs.asan.search.paths += /system/${LIB}/vndk-sp-29
+namespace.rs.asan.search.paths += /data/asan/odm/${LIB}
+namespace.rs.asan.search.paths += /odm/${LIB}
+namespace.rs.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.rs.asan.search.paths += /vendor/${LIB}
+
+namespace.rs.asan.permitted.paths = /data/asan/odm/${LIB}
+namespace.rs.asan.permitted.paths += /odm/${LIB}
+namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB}
+namespace.rs.asan.permitted.paths += /vendor/${LIB}
+namespace.rs.asan.permitted.paths += /data
+
+namespace.rs.links = default,vndk
+
+namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.rs.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+# Private LLNDK libs (e.g. libft2.so) are exceptionally allowed to this
+# namespace because RS framework libs are using them.
+namespace.rs.link.default.shared_libs += libft2.so
+
+namespace.rs.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
+
+###############################################################################
+# "vndk" namespace
+#
+# This namespace is exclusively for vndk-sp libs.
+###############################################################################
+namespace.vndk.isolated = true
+namespace.vndk.visible = true
+
+namespace.vndk.search.paths = /odm/${LIB}/vndk-sp
+namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp
+namespace.vndk.search.paths += /system/${LIB}/vndk-sp-29
+
+namespace.vndk.permitted.paths = /odm/${LIB}/hw
+namespace.vndk.permitted.paths += /odm/${LIB}/egl
+namespace.vndk.permitted.paths += /vendor/${LIB}/hw
+namespace.vndk.permitted.paths += /vendor/${LIB}/egl
+namespace.vndk.permitted.paths += /system/vendor/${LIB}/hw
+namespace.vndk.permitted.paths += /system/vendor/${LIB}/egl
+# This is exceptionally required since android.hidl.memory@1.0-impl.so is here
+namespace.vndk.permitted.paths += /system/${LIB}/vndk-sp-29/hw
+
+namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-29
+namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp-29
+
+namespace.vndk.asan.permitted.paths = /data/asan/odm/${LIB}/hw
+namespace.vndk.asan.permitted.paths += /odm/${LIB}/hw
+namespace.vndk.asan.permitted.paths += /data/asan/odm/${LIB}/egl
+namespace.vndk.asan.permitted.paths += /odm/${LIB}/egl
+namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/hw
+namespace.vndk.asan.permitted.paths += /vendor/${LIB}/hw
+namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl
+namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl
+
+namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp-29/hw
+namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp-29/hw
+
+# The "vndk" namespace links to "default" namespace for LLNDK libs and links to
+# "sphal" namespace for vendor libs. The ordering matters. The "default"
+# namespace has higher priority than the "sphal" namespace.
+namespace.vndk.links = default,sphal,runtime
+
+# When these NDK libs are required inside this namespace, then it is redirected
+# to the default namespace. This is possible since their ABI is stable across
+# Android releases.
+namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.vndk.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.vndk.link.runtime.shared_libs = libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+# Allow VNDK-SP extensions to use vendor libraries
+namespace.vndk.link.sphal.allow_all_shared_libs = true
+
+
+###############################################################################
+# Namespace config for vendor processes. In O, no restriction is enforced for
+# them. However, in O-MR1, access to /system/${LIB} will not be allowed to
+# the default namespace. 'system' namespace will be added to give limited
+# (LL-NDK only) access.
+###############################################################################
+[vendor]
+additional.namespaces = runtime,system,vndk
+
+###############################################################################
+# "default" namespace
+#
+# This is the default linker namespace for a vendor process (a process started
+# from /vendor/bin/*). The main executable and the libs under /vendor/lib[64]
+# are loaded directly into this namespace. However, other libs under the system
+# partition (VNDK and LLNDK libraries) are not loaded here but from the
+# separate namespace 'system'. The delegation to the system namespace is done
+# via the 'namespace.default.link.system.shared_libs' property below.
+#
+# '#VNDK27#' TAG is only for building ld.config.27.txt for backward
+# compatibility. (TODO:b/123390078) Move them to a separate file.
+###############################################################################
+namespace.default.isolated = true
+namespace.default.visible = true
+
+namespace.default.search.paths = /odm/${LIB}
+namespace.default.search.paths += /vendor/${LIB}
+
+namespace.default.permitted.paths = /odm
+namespace.default.permitted.paths += /vendor
+namespace.default.permitted.paths += /system/vendor
+namespace.default.permitted.paths += /usr/libexec/droid-hybris/system/${LIB}
+
+namespace.default.asan.search.paths = /data/asan/odm/${LIB}
+namespace.default.asan.search.paths += /odm/${LIB}
+namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.default.asan.search.paths += /vendor/${LIB}
+
+namespace.default.asan.permitted.paths = /data/asan/odm
+namespace.default.asan.permitted.paths += /odm
+namespace.default.asan.permitted.paths += /data/asan/vendor
+namespace.default.asan.permitted.paths += /vendor
+
+namespace.default.links = system,vndk,runtime
+namespace.default.link.runtime.shared_libs = libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.default.link.system.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.default.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libhidltransport.so:libhwbinder.so:libhwbinder_noltopgo.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so
+namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.common@2.0.so:android.frameworks.cameraservice.device@2.0.so:android.frameworks.cameraservice.service@2.0.so:android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.stats@1.0.so:android.frameworks.vr.composer@1.0.so:android.hardware.atrace@1.0.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@5.0.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio.effect@5.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.audio@5.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.face@1.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth.audio@2.0.so:android.hardware.bluetooth@1.0.so:android.hardware.boot@1.0.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.device@3.5.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.metadata@3.4.so:android.hardware.camera.provider@2.4.so:android.hardware.camera.provider@2.5.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.cas@1.1.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.drm@1.2.so:android.hardware.dumpstate@1.0.so:android.hardware.fastboot@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss.measurement_corrections@1.0.so:android.hardware.gnss.visibility_control@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.gnss@2.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.allocator@3.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.bufferqueue@2.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.graphics.composer@2.3.so:android.hardware.health.storage@1.0.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.input.classifier@1.0.so:android.hardware.input.common@1.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.bufferpool@2.0.so:android.hardware.media.c2@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.neuralnetworks@1.2.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.nfc@1.2.so:android.hardware.oemlock@1.0.so:android.hardware.power.stats@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.power@1.3.so:android.hardware.radio.config@1.0.so:android.hardware.radio.config@1.1.so:android.hardware.radio.config@1.2.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.radio@1.3.so:android.hardware.radio@1.4.so:android.hardware.secure_element@1.0.so:android.hardware.secure_element@1.1.so:android.hardware.sensors@1.0.so:android.hardware.sensors@2.0.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.1.so:android.hardware.soundtrigger@2.2.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.thermal@2.0.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.cec@2.0.so:android.hardware.tv.input@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.usb@1.2.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vibrator@1.3.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.hostapd@1.1.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi.supplicant@1.2.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hardware.wifi@1.3.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0.so:android.hidl.token@1.0-utils.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.suspend@1.0.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.scudo-aarch64-android.so:libclang_rt.scudo-arm-android.so:libclang_rt.scudo_minimal-aarch64-android.so:libclang_rt.scudo_minimal-arm-android.so:libclang_rt.ubsan_minimal-aarch64-android.so:libclang_rt.ubsan_minimal-arm-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.ubsan_standalone-arm-android.so:libcn-cbor.so:libcodec2.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libhardware_legacy.so:libhidlallocatorutils.so:libhidlcache.so:libjpeg.so:libkeymaster_messages.so:libkeymaster_portable.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libprotobuf-cpp-full.so:libprotobuf-cpp-lite.so:libpuresoftkeymasterdevice.so:libradio_metadata.so:libselinux.so:libsoftkeymasterdevice.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_bufferpool@2.0.so:libstagefright_bufferqueue_helper.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_xmlparser.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so
+
+###############################################################################
+# "runtime" APEX namespace
+#
+# This namespace exposes externally accessible libraries from the Runtime APEX.
+###############################################################################
+namespace.runtime.isolated = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.links = system
+# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
+# when it exists.
+namespace.runtime.link.system.allow_all_shared_libs = true
+
+###############################################################################
+# "vndk" namespace
+#
+# This namespace is where VNDK and VNDK-SP libraries are loaded for
+# a vendor process.
+###############################################################################
+namespace.vndk.isolated = false
+
+namespace.vndk.search.paths = /odm/${LIB}/vndk
+namespace.vndk.search.paths += /odm/${LIB}/vndk-sp
+namespace.vndk.search.paths += /vendor/${LIB}/vndk
+namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp
+namespace.vndk.search.paths += /system/${LIB}/vndk-sp-29
+namespace.vndk.search.paths += /system/${LIB}/vndk-29
+
+namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk
+namespace.vndk.asan.search.paths += /odm/${LIB}/vndk
+namespace.vndk.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk
+namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk
+namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp
+namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp-29
+namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp-29
+namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-29
+namespace.vndk.asan.search.paths += /system/${LIB}/vndk-29
+
+# When these NDK libs are required inside this namespace, then it is redirected
+# to the system namespace. This is possible since their ABI is stable across
+# Android releases. The links here should be identical to that of the
+# 'vndk_in_system' namespace, except for the link between 'vndk' and
+# 'vndk_in_system'.
+namespace.vndk.links = system,default,runtime
+
+namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.vndk.link.system.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.vndk.link.default.allow_all_shared_libs = true
+
+namespace.vndk.link.runtime.shared_libs = libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+
+
+###############################################################################
+# "system" namespace
+#
+# This namespace is where system libs (VNDK and LLNDK libs) are loaded for
+# a vendor process.
+###############################################################################
+namespace.system.isolated = false
+
+namespace.system.search.paths = /system/${LIB}
+namespace.system.search.paths += /product/${LIB}
+
+namespace.system.asan.search.paths = /data/asan/system/${LIB}
+namespace.system.asan.search.paths += /system/${LIB}
+namespace.system.asan.search.paths += /data/asan/product/${LIB}
+namespace.system.asan.search.paths += /product/${LIB}
+namespace.system.asan.search.paths += /data/asan/product_services/${LIB}
+
+namespace.system.links = runtime
+namespace.system.link.runtime.shared_libs = libdexfile_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.system.link.runtime.shared_libs += libicui18n.so
+namespace.system.link.runtime.shared_libs += libicuuc.so
+namespace.system.link.runtime.shared_libs += libnativebridge.so
+namespace.system.link.runtime.shared_libs += libnativehelper.so
+namespace.system.link.runtime.shared_libs += libnativeloader.so
+# Workaround for b/124772622
+namespace.system.link.runtime.shared_libs += libandroidicu.so
+namespace.system.link.runtime.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+###############################################################################
+# "vndk_in_system" namespace
+#
+# This namespace is where no-vendor-variant VNDK libraries are loaded for a
+# vendor process. Note that we do not simply export these libraries from
+# "system" namespace, because in some case both the core variant and the
+# vendor variant of a VNDK library may be loaded. In such case, we do not
+# want to eliminate double-loading because doing so means the global states
+# of the library would be shared.
+#
+# Only the no-vendor-variant VNDK libraries are whitelisted in this namespace.
+# This is to ensure that we do not load libraries needed by no-vendor-variant
+# VNDK libraries into vndk_in_system namespace.
+###############################################################################
+namespace.vndk_in_system.isolated = true
+namespace.vndk_in_system.visible = true
+
+# The search paths here should be kept the same as that of the 'system'
+# namespace.
+namespace.vndk_in_system.search.paths = /system/${LIB}
+namespace.vndk_in_system.search.paths += /product/${LIB}
+
+namespace.vndk_in_system.asan.search.paths = /data/asan/system/${LIB}
+namespace.vndk_in_system.asan.search.paths += /system/${LIB}
+namespace.vndk_in_system.asan.search.paths += /data/asan/product/${LIB}
+namespace.vndk_in_system.asan.search.paths += /product/${LIB}
+namespace.vndk_in_system.asan.search.paths += /data/asan/product_services/${LIB}
+
+
+
+# The links here should be identical to that of the 'vndk' namespace, with the
+# following exception:
+# 1. 'vndk_in_system' needs to be freely linked back to 'vndk'.
+# 2. 'vndk_in_system' does not need to link to 'default', as any library that
+# requires anything vendor would not be a vndk_in_system library.
+namespace.vndk_in_system.links = vndk,system,runtime
+namespace.vndk_in_system.link.runtime.shared_libs = libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.vndk_in_system.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.vndk_in_system.link.system.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.vndk_in_system.link.vndk.allow_all_shared_libs = true
+
+
+###############################################################################
+# Namespace config for native tests that need access to both system and vendor
+# libraries. This replicates the default linker config (done by
+# init_default_namespace_no_config in bionic/linker/linker.cpp), except that it
+# includes the requisite namespace setup for APEXes.
+###############################################################################
+[unrestricted]
+additional.namespaces = runtime,media,conscrypt,resolv
+
+namespace.default.search.paths = /system/${LIB}
+namespace.default.search.paths += /odm/${LIB}
+namespace.default.search.paths += /vendor/${LIB}
+
+namespace.default.asan.search.paths = /data/asan/system/${LIB}
+namespace.default.asan.search.paths += /system/${LIB}
+namespace.default.asan.search.paths += /data/asan/odm/${LIB}
+namespace.default.asan.search.paths += /odm/${LIB}
+namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
+namespace.default.asan.search.paths += /vendor/${LIB}
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.default.links = runtime,resolv
+namespace.default.visible = true
+
+namespace.default.link.runtime.shared_libs = libdexfile_external.so
+# libicuuc.so and libicui18n.so are kept for app compat reason. http://b/130788466
+namespace.default.link.runtime.shared_libs += libicui18n.so
+namespace.default.link.runtime.shared_libs += libicuuc.so
+namespace.default.link.runtime.shared_libs += libnativebridge.so
+namespace.default.link.runtime.shared_libs += libnativehelper.so
+namespace.default.link.runtime.shared_libs += libnativeloader.so
+namespace.default.link.runtime.shared_libs += libandroidicu.so
+
+# TODO(b/122876336): Remove libpac.so once it's migrated to Webview
+namespace.default.link.runtime.shared_libs += libpac.so
+namespace.default.link.runtime.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+namespace.default.link.resolv.shared_libs = libnetd_resolv.so
+
+###############################################################################
+# "runtime" APEX namespace
+#
+# This namespace exposes externally accessible libraries from the Runtime APEX.
+###############################################################################
+namespace.runtime.isolated = true
+namespace.runtime.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB}
+namespace.runtime.links = default
+# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library
+# when it exists.
+namespace.runtime.link.default.allow_all_shared_libs = true
+
+###############################################################################
+# "media" APEX namespace
+#
+# This namespace is for libraries within the media APEX.
+###############################################################################
+namespace.media.isolated = true
+namespace.media.visible = true
+
+namespace.media.search.paths = /apex/com.android.media/${LIB}
+namespace.media.asan.search.paths = /apex/com.android.media/${LIB}
+
+namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors
+namespace.media.asan.permitted.paths = /apex/com.android.media/${LIB}/extractors
+
+namespace.media.links = default
+namespace.media.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so
+namespace.media.link.default.shared_libs += libbinder_ndk.so
+namespace.media.link.default.shared_libs += libmediametrics.so
+namespace.media.link.default.shared_libs += libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
+
+###############################################################################
+# "conscrypt" APEX namespace
+#
+# This namespace is for libraries within the conscrypt APEX.
+###############################################################################
+namespace.conscrypt.isolated = true
+namespace.conscrypt.visible = true
+
+# Keep in sync with ld.config.txt in the com.android.runtime APEX.
+namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.asan.search.paths = /apex/com.android.conscrypt/${LIB}
+namespace.conscrypt.links = runtime,default
+namespace.conscrypt.link.runtime.shared_libs = libandroidio.so
+namespace.conscrypt.link.default.shared_libs = libc.so
+namespace.conscrypt.link.default.shared_libs += libm.so
+namespace.conscrypt.link.default.shared_libs += libdl.so
+namespace.conscrypt.link.default.shared_libs += liblog.so
+
+###############################################################################
+# "resolv" APEX namespace
+#
+# This namespace is for libraries within the resolv APEX.
+###############################################################################
+namespace.resolv.isolated = true
+namespace.resolv.visible = true
+
+namespace.resolv.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.asan.search.paths = /apex/com.android.resolv/${LIB}
+namespace.resolv.links = default
+namespace.resolv.link.default.shared_libs = libc.so
+namespace.resolv.link.default.shared_libs += libm.so
+namespace.resolv.link.default.shared_libs += libdl.so
+namespace.resolv.link.default.shared_libs += libbinder_ndk.so
+namespace.resolv.link.default.shared_libs += liblog.so
+
+
+###############################################################################
+# Namespace config for binaries under /postinstall.
+# Only default namespace is defined and default has no directories
+# other than /system/lib in the search paths. This is because linker calls
+# realpath on the search paths and this causes selinux denial if the paths
+# (/vendor, /odm) are not allowed to the postinstall binaries. There is no
+# reason to allow the binaries to access the paths.
+###############################################################################
+[postinstall]
+namespace.default.isolated = false
+namespace.default.search.paths = /system/${LIB}
+namespace.default.search.paths += /product/${LIB}
+
+namespace.default.link.runtime.shared_libs = libclang_rt.asan-aarch64-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.ubsan_standalone-aarch64-android.so:libclang_rt.tsan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.tsan-arm-android.so
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/usr/share/ngfd/plugins.d/60-profile.ini
^
|
| @@ -0,0 +1,3 @@
+[profile]
+touchscreen.sound.level = 0;18;50;75
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/var/lib/environment/compositor/droid-hal-device.conf
^
|
| @@ -0,0 +1,5 @@
+EGL_PLATFORM=hwcomposer
+QT_QPA_PLATFORM=hwcomposer
+
+LIPSTICK_OPTIONS="-plugin evdevtouch -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap"
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse-10/var/lib/environment/nemo/99-qtscenegraph.conf
^
|
| @@ -0,0 +1,2 @@
+# This flag needs to be set, regardless of its value
+QT_OPENGL_NO_BGRA=1
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/main.conf
^
|
| @@ -14,17 +14,16 @@
# 0 = disable timer, i.e. stay discoverable forever
DiscoverableTimeout = 0
+# Always allow pairing even if there are no agent registered
+# Possible values: true, false
+# Default: false
+#AlwaysPairable = false
+
# How long to stay in pairable mode before going back to non-discoverable
# The value is in seconds. Default is 0.
# 0 = disable timer, i.e. stay pairable forever
PairableTimeout = 0
-# Automatic connection for bonded devices driven by platform/user events.
-# If a platform plugin uses this mechanism, automatic connections will be
-# enabled during the interval defined below. Initially, this feature
-# intends to be used to establish connections to ATT channels. Default is 60.
-AutoConnectTimeout = 60
-
# Use vendor id source (assigner), vendor, product and version information for
# DID profile support. The values are separated by ":" and assigner, VID, PID
# and version.
@@ -32,9 +31,11 @@
#DeviceID = bluetooth:1234:5678:abcd
# Do reverse service discovery for previously unknown devices that connect to
-# us. This option is really only needed for qualification since the BITE tester
-# doesn't like us doing reverse SDP for some test cases (though there could in
-# theory be other useful purposes for this too). Defaults to 'true'.
+# us. For BR/EDR this option is really only needed for qualification since the
+# BITE tester doesn't like us doing reverse SDP for some test cases, for LE
+# this disables the GATT client functionally so it can be used in system which
+# can only operate as peripheral.
+# Defaults to 'true'.
ReverseServiceDiscovery = true
# Enable name resolving after inquiry. Set it to 'false' if you don't need
@@ -72,6 +73,11 @@
# Defaults to "off"
# Privacy = off
+# Specify the policy to the JUST-WORKS repairing initiated by peer
+# Possible values: "never", "confirm", "always"
+# Defaults to "never"
+#JustWorksRepairing = never
+
[GATT]
# GATT attribute cache.
# Possible values:
@@ -84,6 +90,21 @@
# Default: always
#Cache = always
+# Minimum required Encryption Key Size for accessing secured characteristics.
+# Possible values: 0 and 7-16. 0 means don't care.
+# Defaults to 0
+#KeySize = 0
+
+# Exchange MTU size.
+# Possible values: 23-517
+# Defaults to 517
+#ExchangeMTU = 517
+
+# Number of ATT channels
+# Possible values: 1-5 (1 disables EATT)
+# Default to 3
+#Channels = 3
+
[Policy]
#
# The ReconnectUUIDs defines the set of remote services that should try
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -23,7 +23,12 @@
.fail
-load-module module-droid-keepalive
+# Transitional check as keepalive module is moved away from droid modules.
+.ifexists module-keepalive.so
+ load-module module-keepalive
+.else
+ load-module module-droid-keepalive
+.endif
### If droid-card needs other arguments than the default, have the new
### load-module line in /etc/pulse/arm_droid_card_custom.pa
@@ -40,6 +45,12 @@
.fail
.endif
+.ifexists module-droid-hidl.so
+ .nofail
+ load-module module-droid-hidl
+ .fail
+.endif
+
load-module module-meego-parameters cache=1 directory=/var/lib/nemo-pulseaudio-parameters use_voice=false
load-module module-meego-mainvolume virtual_stream=true
@@ -49,6 +60,9 @@
.include /etc/pulse/bluez5_stream_restore.pa
.else
.include /etc/pulse/bluez4_stream_restore.pa
+ # fake sco sink and source are needed only by bluez4 device
+ load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
+ load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -58,9 +72,8 @@
load-module module-augment-properties
load-module module-null-sink sink_name=sink.null rate=48000
+load-module module-null-source source_name=source.null rate=48000
-load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
-load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement
@@ -120,4 +133,4 @@
### Move orphan streams to placeholder sinks or sources so that playback doesn't get
### interrupted. Policy enforcement module then moves the streams to new appropriate
### sinks or sources.
-load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
+load-module module-rescue-streams sink_name=sink.null source_name=source.null
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/x-maemo-route.table
^
|
| @@ -1,2 +1,3 @@
sink-input-by-media-role:x-maemo -25
sink-input-by-media-role:phone -15
+sink-input-by-media-role:voip -16
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/x-maemo-stream-restore.table
^
|
| @@ -1,5 +1,6 @@
sink-input-by-media-role:x-maemo -20
sink-input-by-media-role:phone -15
+sink-input-by-media-role:voip -16
sink-input-by-media-role:animation -20
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -43,6 +43,10 @@
# -------- Group section -------------------------------------------------------
[group]
+name = othermedia
+flags = route_audio, limit_volume, cork_stream
+
+[group]
name = idle
flags = nopolicy
sink = sink.null
@@ -164,11 +168,11 @@
[group]
name = alien
-flags = route_audio, limit_volume, cork_stream
+flags = route_audio, limit_volume, mute_by_route
[group]
name = aliencall
-flags = route_audio, limit_volume, cork_stream
+flags = route_audio, limit_volume, mute_by_route
[group]
name = probesink
@@ -203,6 +207,13 @@
delay = $delay_time
[device]
+type = ihfandlineout
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-speaker+wired_headphone
+flags = $droid_sink_port_change_delay
+delay = $delay_time
+
+[device]
type = bta2dp
sink = startswith:"bluez_sink"
ports = droid.output.primary@equals:"true"->output-speaker
@@ -343,6 +354,26 @@
flags = refresh_always
[device]
+type = lineout
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = disable_notify, refresh_always, $droid_sink_port_change_delay
+delay = $delay_time
+
+[device]
+type = lineoutforcall
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = refresh_always, delayed_port_change
+delay = 200
+
+[device]
+type = lineoutforalien
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = refresh_always
+
+[device]
type = ihfandtvout
sink = droid.output.media_latency@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
@@ -539,6 +570,16 @@
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"inactive"
[context-rule]
+variable = call
+value = equals:voip
+set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"voip"
+
+[context-rule]
variable = media_state
value = matches:"^[^t].*"
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.media.state", value@copy-from-context
+
+[context-rule]
+variable = emergency_call
+value = matches:".*"
+set-property = module-name@equals:module-policy-enforcement, property:"x.emergency_call.state", value@copy-from-context
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -11,6 +11,11 @@
profile = ringtone
[card]
+type = ihfandlineout
+name = equals:$droid_card
+profile = ringtone
+
+[card]
type = headset
name = equals:$droid_card
profile = $droid_card_profile
@@ -40,6 +45,21 @@
name = equals:$droid_card
profile = communication
+[card]
+type = lineout
+name = equals:$droid_card
+profile = $droid_card_profile
+
+[card]
+type = lineoutforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = lineoutforalien
+name = equals:$droid_card
+profile = communication
+
[card]
type = ihfandtvout
name = equals:$droid_card
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -88,6 +88,14 @@
flags1 = disable_notify
[card]
+type = ihfandlineout
+name0 = equals:$droid_card
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
type = headset
name0 = equals:$droid_card
profile0= $droid_card_profile
@@ -136,6 +144,30 @@
flags1 = disable_notify
[card]
+type = lineout
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
+type = lineoutforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
+type = lineoutforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
type = ihfandtvout
name0 = equals:$droid_card
profile0= $droid_card_profile
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -18,6 +18,19 @@
flags = refresh_always, module_unload_immediately
[device]
+type = lineoutasfmradio
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+flags = refresh_always
+
+[device]
+type = lineoutasfmradiolp
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
+flags = refresh_always, module_unload_immediately
+
+[device]
type = headsetasfmradio
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/selinux/config
^
|
| @@ -0,0 +1 @@
+SELINUX=disabled
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -5,3 +5,4 @@
requires:libhybris-libEGL
requires:libhybris-libGLESv2
requires:libhybris-libwayland-egl
+requires:patterns-sailfish-core-device
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -4,7 +4,6 @@
SUBSYSTEM=="adsp", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="msm_camera", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="mtd", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="block", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="misc", KERNEL=="log_events", SYMLINK+="alog/events"
SUBSYSTEM=="misc", KERNEL=="log_radio", SYMLINK+="alog/radio"
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
@@ -35,21 +34,21 @@
# be). If android-init doesn't create the bootdevice symlink and there is no
# androidboot.bootdevice on the cmdline, then the bootdevice symlink is not
# required.
-IMPORT{cmdline}="bootdevice"
+IMPORT{cmdline}="androidboot.bootdevice"
# Unfortunately we cannot compare two variables, therefore use a workaround
# with a file.
-ENV{bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+ENV{androidboot.bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{androidboot.bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{androidboot.bootdevice} /dev/block/bootdevice"
# On certain devices the path is .../$PLATFORM_FOLDER/$PLATFORM_DEVICE/...,
# but on others there is no $PLATFORM_DEVICE subdirectory, or in other words,
# PLATFORM_FOLDER=platform device, PLATFORM_DEVICE=empty string. (1).
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
-SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{androidboot.bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{androidboot.bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{androidboot.bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{androidboot.bootdevice} /dev/block/bootdevice"
# Create the partition symlinks.
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
@@ -60,3 +59,5 @@
# NOTE: if the comment marked with (1) applies then this will not do anything.
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/by-name/$env{ID_PART_ENTRY_NAME}"
+SUBSYSTEM=="firmware", ACTION=="add", RUN="/usr/bin/droid/droid-load-firmware.sh"
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
| @@ -32,10 +32,11 @@
# class_stop main
# class_stop core
-# Kill all processes that are in this same cgroup ($1)
-[ -z "$1" ] && echo "Need cgroup path" && exit 1
-CGROUP=$1
-[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1
+# Kill all processes that are in this same cgroup.
+# Deducing the name of the service's cgroup based on the shutdown script's
+# cgroup name.
+CGROUP=$(cat /proc/self/cgroup | sed -r '/1:name=systemd:/!d;s|||;s|/control||')
+[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $CGROUP" && exit 1
get_pids() {
# Get list of running pids in this cgroup
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-load-firmware.sh
^
|
| @@ -0,0 +1,32 @@
+#!/bin/sh
+
+FIRMWARE_FOLDERS="/system/etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/"
+
+log() {
+ logger -p daemon.info -t firmware "$@"
+}
+
+log "Attempting to load firmware $FIRMWARE for $DEVPATH"
+
+if [ -e /sys$DEVPATH/loading ]; then
+ for folder in $FIRMWARE_FOLDERS; do
+ if [ -e "$folder/$FIRMWARE" ]; then
+ log "Loading firmware $folder/$FIRMWARE"
+
+ echo 1 > /sys$DEVPATH/loading
+ cat "$folder/$FIRMWARE" > /sys$DEVPATH/data
+ echo 0 > /sys$DEVPATH/loading
+
+ log "Loaded firmware $FIRMWARE"
+ exit 0
+ fi
+ done
+
+ log "Failed to find firmware $FIRMWARE for $DEVPATH"
+ echo "\-1" > /sys$DEVPATH/loading
+ exit 1
+else
+ log "Failed to find /sys$DEVPATH/loading, could not load $FIRMWARE."
+ exit 1
+fi
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
| +(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-hal-init.service
^
|
| @@ -0,0 +1,28 @@
+[Unit]
+Description=droid-hal-init
+Wants=systemd-udev-settle.service
+After=local-fs.target systemd-udev-settle.service systemd-tmpfiles-setup.service
+Before=basic.target network.target bluetooth.service ofono.service sensorfwd.service
+DefaultDependencies=no
+Conflicts=shutdown.target
+# Lets not do Requires= here as that means that this service will restart which leads automatically
+# to broken state as android init can be only started once per boot. If something goes wrong
+# our best hope is that android init doesn't notice that and that the crashing party fixes itself :)
+
+[Service]
+Type=notify
+NotifyAccess=all
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+ExecStartPre=-/bin/sh /usr/bin/droid/droid-hal-early-init.sh
+ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh
+Restart=always
+# Lets make sure we don't block minutes in case of errors.
+TimeoutSec=15
+StartLimitInterval=60
+StartLimitBurst=2
+
+[Install]
+WantedBy=graphical.target
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-late-start.service
^
|
| (renamed from droid-configs-device/sparse/lib/systemd/system/droid-late-start.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/graphical.target.wants/droid-hal-init.service
^
|
| +(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/graphical.target.wants/droid-late-start.service
^
|
| +(symlink to ../droid-late-start.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/bta2dp
^
|
| @@ -1,3 +1,4 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
x-nemo.mainvolume.high-volume-step = "15"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/btmono
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-3625,4:-3025,5:-2425,6:-2025,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-250,14:-125,15:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/hp
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-6175,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/ihf
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-3800,2:-3187,3:-2648,4:-2158,5:-1716,6:-1324,7:-932,8:-612,9:-368,10:-122,11:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/lineout
^
|
| @@ -1,3 +1,4 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-5500,2:-5000,3:-4500,4:-4000,5:-3600,6:-3200,7:-2800,8:-2500,9:-2200,10:-1900,11:-1600,12:-1300,13:-1100,14:-950,15:-800,16:-600,17:-400,18:-200,19:0"
x-nemo.mainvolume.high-volume-step = "12"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/patterns/jolla-configuration-titan.yaml
^
|
| @@ -4,43 +4,7 @@
Description: Pattern with packages for titan configurations
Name: jolla-configuration-titan
Requires:
-- pattern:jolla-hw-adaptation-titan
-
-- patterns-sailfish-applications
-- patterns-sailfish-ui
-# For devices with cellular modem. Those without one, please comment out:
-- patterns-sailfish-cellular-apps
-# Early stages of porting benefit from these:
-- pattern:sailfish-porter-tools
-
-- sailfish-content-graphics-z@ICON_RES@
-
-# Multi-SIM settings
-- jolla-settings-networking-multisim
-
-# Introduced starting Sailfish OS 2.0.4.x:
-# 3rd party accounts like Twitter, VK, cloud services, etc
-- jolla-settings-accounts-extensions-3rd-party-all
-
-# Jolla Store items
-- patterns-sailfish-consumer-generic
-
-# Non-trusted app installation support
-- jolla-settings-system-sideloading
-
-# For Mozilla location services (online)
-- geoclue-provider-mlsdb
-
-# Sailfish OS CSD tool for hardware testing
-# needs some configuration to get all features working
-- csd
-
-# sd-utils for mounting sdcard
-- sd-utils
-
-# For all keyboard layouts
-- jolla-keyboard-layout-all
-
+- patterns-sailfish-device-configuration-titan
Summary: Jolla Configuration titan
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/patterns/patterns-sailfish-device-adaptation-titan.inc
^
|
| @@ -0,0 +1,101 @@
+%package -n patterns-sailfish-device-adaptation-titan
+Summary: Jolla HW Adaptation titan
+
+Requires: droid-hal-titan
+Requires: droid-hal-titan-img-boot
+Requires: droid-hal-titan-kernel
+Requires: droid-hal-titan-kernel-modules
+Requires: droid-hal-titan-detritus
+Requires: droid-config-titan-sailfish
+Requires: droid-config-titan-pulseaudio-settings
+Requires: droid-config-titan-policy-settings
+Requires: droid-config-titan-preinit-plugin
+Requires: droid-config-titan-flashing
+Requires: droid-config-titan-bluez4
+Requires: droid-hal-version-titan
+
+# Hybris packages
+Requires: libhybris-libEGL
+Requires: libhybris-libGLESv2
+Requires: libhybris-libwayland-egl
+
+# Sensors
+Requires: hybris-libsensorfw-qt5
+
+# Vibra
+Requires: ngfd-plugin-native-vibrator
+Requires: qt5-feedback-haptics-native-vibrator
+
+# Needed for /dev/touchscreen symlink
+Requires: qt5-plugin-generic-evdev
+
+Requires: pulseaudio-modules-droid
+
+# for audio recording to work:
+Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
+
+# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
+Requires: qt5-qtwayland-wayland_egl
+Requires: qt5-qpa-hwcomposer-plugin
+Requires: qtscenegraph-adaptation
+
+# GStreamer v0.10 multimedia support is being deprecated
+#Requires: gstreamer0.10-droidcamsrc
+#Requires: gstreamer0.10-omx
+#Requires: gstreamer0.10-droideglsink
+#Requires: nemo-qtmultimedia-plugins-gstvideotexturebackend
+
+# Add GStreamer v1.0 as standard
+Requires: gstreamer1.0
+Requires: gstreamer1.0-plugins-good
+Requires: gstreamer1.0-plugins-base
+Requires: gstreamer1.0-plugins-bad
+Requires: nemo-gstreamer1.0-interfaces
+Requires: gstreamer1.0-droid
+
+# This is needed for notification LEDs
+Requires: mce-plugin-libhybris
+
+## USB mode controller
+# Enables mode selector upon plugging USB cable:
+Requires: usb-moded
+Requires: usb-moded-defaults-android
+Requires: usb-moded-developer-mode-android
+
+# Extra useful modes not officially supported:
+# working but careful with roaming!
+Requires: usb-moded-connection-sharing-android-config
+# android diag mode only usable for certain android tools
+#Requires: usb-moded-diag-mode-android
+
+# jolla-rnd-device will enable usb-moded even when UI is not yet
+# brought up (useful during development, available since update10)
+Requires: jolla-rnd-device
+
+# from update13, this is needed explicitly
+#Requires: bluez-configs-sailfish
+# hammerhead, grouper, and maguro use this in scripts, so include for all
+Requires: rfkill
+
+# enable device lock and allow to select untrusted software
+Requires: jolla-devicelock-plugin-encsfa
+
+# For GPS
+Requires: geoclue-provider-hybris
+# For Mozilla location services (online)
+Requires: geoclue-provider-mlsdb
+
+# Fix for calls
+Requires: pulseaudio-modules-droid-glue
+
+# Flashlight
+Requires: jolla-settings-system-flashlight
+
+# For FM radio
+Requires: qt5-qtmultimedia-plugin-mediaservice-irisradio
+Requires: jolla-mediaplayer-radio
+
+%description -n patterns-sailfish-device-adaptation-titan
+Pattern with packages for titan HW Adaptation
+
+%files -n patterns-sailfish-device-adaptation-titan
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/patterns/patterns-sailfish-device-configuration-titan.inc
^
|
| @@ -0,0 +1,56 @@
+%package -n patterns-sailfish-device-configuration-titan
+Summary: Jolla Configuration titan
+Requires: patterns-sailfish-device-configuration-common-titan
+Requires: patterns-sailfish-device-adaptation-titan
+
+# For devices with cellular modem. Those without one, please comment out:
+Requires: patterns-sailfish-cellular-apps
+
+Requires: sailfish-content-graphics-z%{icon_res}
+
+# Multi-SIM settings
+Requires: jolla-settings-networking-multisim
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+Requires: jolla-settings-accounts-extensions-3rd-party-all
+
+# Jolla Store items
+Requires: patterns-sailfish-consumer-generic
+
+# Non-trusted app installation support
+Requires: jolla-settings-system-sideloading
+
+# For Mozilla location services (online)
+Requires: geoclue-provider-mlsdb
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+
+# sd-utils for mounting sdcard
+Requires: sd-utils
+
+# For all keyboard layouts
+Requires: jolla-keyboard-layout-all
+
+Requires: patterns-sailfish-rnd
+# dev-tools pattern will be fixed in the next release
+# for now we'll use its 'exploded' version:
+#Requires: patterns-sailfish-dev-tools
+Recommends: jolla-developer-mode
+Requires: strace
+Requires: gdb
+Requires: gdb-gdbserver
+Requires: vim-enhanced
+Requires: less
+Requires: valgrind
+Requires: lipstick-qt5-tools
+Requires: libhybris-tests
+Requires: busybox-static
+Requires: openssh-server
+Requires: zypper
+
+%description -n patterns-sailfish-device-configuration-titan
+Pattern with packages for titan configurations
+
+%files -n patterns-sailfish-device-configuration-titan
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/bluetooth.service.wants/droid-fm-up.service
^
|
| +(symlink to ../droid-fm-up.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/bluetooth.service.wants/droid-hcismd-up.service
^
|
| +(symlink to ../droid-hcismd-up.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/droid-fm-up.service
^
|
| (renamed from sparse/lib/systemd/system/droid-fm-up.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/droid-hcismd-up.service
^
|
| (renamed from sparse/lib/systemd/system/droid-hcismd-up.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/graphical.target.wants/sensors-delay-hack.service
^
|
| +(symlink to ../sensors-delay-hack.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/local-fs.target.wants/pds.service
^
|
| +(symlink to ../pds.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/multi-user.target.wants/wlan-module-load.service
^
|
| +(symlink to ../wlan-module-load.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/multi-user.target.wants/zramswap.service
^
|
| +(symlink to ../zramswap.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/pds.service
^
|
| (renamed from sparse/lib/systemd/system/pds.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/sensors-delay-hack.service
^
|
| (renamed from sparse/lib/systemd/system/sensors-delay-hack.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/wlan-module-load.service
^
|
| (renamed from sparse/lib/systemd/system/wlan-module-load.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20210221145236.18.g3513575.tar.bz2/sparse/usr/lib/systemd/system/zramswap.service
^
|
| (renamed from sparse/lib/systemd/system/zramswap.service)
|
