[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/mlehtima/droid-config-fp2-sibon.git</param>
<param name="branch">master</param>
- <param name="revision">0d5c73f555464fc94320041180ba87ed86bc510f</param>
+ <param name="revision">f97dd9b8b47cbdec7b7ed7b8b55d7c24fee780d5</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -59,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
@@ -294,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}
@@ -380,8 +392,17 @@
# 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
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/helpers/migrate_patterns.sh
^
|
@@ -32,6 +32,7 @@
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"
{
@@ -75,8 +76,18 @@
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-dev-tools"
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"
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-adaptation-@DEVICE@.inc
^
|
@@ -42,8 +42,9 @@
Requires: qt5-qpa-hwcomposer-plugin
Requires: qtscenegraph-adaptation
-# For devices with droidmedia and gst-droid built, see HADK pdf for more information
+# 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
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-configuration-@DEVICE@.inc
^
|
@@ -8,7 +8,17 @@
# Early stages of porting benefit from these:
Requires: patterns-sailfish-rnd
-Requires: patterns-sailfish-dev-tools
+# 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
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/sparse-10/etc/acdbdata
^
|
+(symlink to /vendor/etc/acdbdata)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/sparse-10/etc/sensorfw/primaryuse.conf
^
|
@@ -0,0 +1,14 @@
+[plugins]
+accelerometeradaptor = hybrisaccelerometeradaptor
+alsadaptor = hybrisalsadaptor
+proximityadaptor = hybrisproximityadaptor
+magnetometeradaptor = hybrismagnetometeradaptor
+orientationadaptor = hybrisorientationadaptor
+
+[magnetometer]
+scale_coefficient = 1
+transformation_matrix = "-1,0,0,0,1,0,0,0,1"
+needs_calibration = 0
+
+[accelerometer]
+transformation_matrix = "1,0,0,0,1,0,0,0,1"
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.70.tar.bz2/droid-configs-device/sparse-10/etc/xdg/QtProject/Sensors.conf
^
|
@@ -0,0 +1,9 @@
+[Default]
+QAccelerometer=sensorfw.accelerometer
+QAmbientLightSensor=sensorfw.als
+QCompass=sensorfw.compass
+QMagnetometer=sensorfw.magnetometer
+QOrientationSensor=sensorfw.orientationsensor
+QProximitySensor=sensorfw.proximitysensor
+QRotationSensor=sensorfw.rotationsensor
+QLightSensor=sensorfw.lightsensor
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.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-fp2-sibon-0.0.70.tar.bz2/patterns/patterns-sailfish-device-configuration-fp2-sibon.inc
^
|
@@ -6,16 +6,22 @@
# For devices with cellular modem. Those without one, please comment out:
Requires: patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
-Requires: jolla-developer-mode
-Requires: sailfishsilica-qt5-demos
+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: net-tools
-Requires: openssh-clients
Requires: openssh-server
-Requires: vim-enhanced
Requires: zypper
-Requires: strace
# jolla-rnd-device will enable usb-moded even when UI is not yet
# brought up (useful during development, available since update10)
|