Skip to content

Make memfd switch optional #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make memfd switch optional #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions axolotl/BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ TARGET_SCREEN_DENSITY := 400

# Kernel/boot.img Configuration
BOARD_KERNEL_CMDLINE += androidboot.hardware=axolotl
BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive

##### Partition handling

Expand Down
3 changes: 3 additions & 0 deletions axolotl/device.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ PRODUCT_COPY_FILES := \
device/generic/sdm845/shared/init.sdm845.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.axolotl.usb.rc \
device/generic/sdm845/shared/key_layout.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/axolotl.kl

PRODUCT_COPY_FILES += \
device/generic/sdm845/shared/init.memfd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.memfd.rc

# Audio
PRODUCT_PACKAGES += audio.primary.axolotl

Expand Down
1 change: 1 addition & 0 deletions enchilada/BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ TARGET_SCREEN_DENSITY := 400

# Kernel/boot.img Configuration
BOARD_KERNEL_CMDLINE += androidboot.hardware=enchilada
BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive

# Image Configuration
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360
Expand Down
3 changes: 3 additions & 0 deletions enchilada/device.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ PRODUCT_COPY_FILES := \
device/generic/sdm845/shared/init.sdm845.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.enchilada.usb.rc \
device/generic/sdm845/shared/key_layout.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/enchilada.kl

PRODUCT_COPY_FILES += \
device/generic/sdm845/shared/init.memfd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.memfd.rc

# Build generic Audio HAL
PRODUCT_PACKAGES := audio.primary.enchilada

Expand Down
2 changes: 1 addition & 1 deletion shared/BoardConfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ BOARD_RAMDISK_OFFSET := 0x01000000
BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon earlyprintk console=tty0 androidboot.console=ttyMSM0 no_console_suspend
BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc@0/1d84000.ufshc
BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30 androidboot.selinux=permissive
BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30

# Image Configuration
BOARD_FLASH_BLOCK_SIZE := 262144
Expand Down
5 changes: 5 additions & 0 deletions shared/init.memfd.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
on post-fs-data
# set sys.memfd_use to true now that the ashmem is dropped v5.18
# https://lore.kernel.org/all/[email protected]/.
# boots only with selinux=permissive for now
setprop sys.use_memfd true
5 changes: 0 additions & 5 deletions shared/init.sdm845.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ on zygote-start
mkdir /data/vendor/wifi/wpa 0770 wifi wifi
mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi

on post-fs-data
# set sys.memfd_use to true now that the ashmem is dropped v5.18
# https://lore.kernel.org/all/[email protected]/.
setprop sys.use_memfd true

on property:sys.boot_completed=1
chmod 0755 /sys/kernel/debug/tracing

Expand Down