Skip to content
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.

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

Remove bspdiff #2145

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion groups/boot-arch/project-celadon/BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
#

# NOTE: These values must be kept in sync with BOARD_GPT_INI
BOARD_BOOTIMAGE_PARTITION_SIZE ?= 42991616
BOARD_BOOTIMAGE_PARTITION_SIZE ?= 47185920
SYSTEM_PARTITION_SIZE = $(shell echo {{system_partition_size}}*1024*1024 | bc)
{{^dynamic-partitions}}
BOARD_SYSTEMIMAGE_PARTITION_SIZE ?= $(SYSTEM_PARTITION_SIZE)
Expand Down
1 change: 1 addition & 0 deletions groups/boot-arch/project-celadon/fstab
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
{{#dynamic-partitions}}
system /system {{system_fs}} ro{{#system_fs_ext4}},barrier=1{{/system_fs_ext4}} wait{{#slot-ab}},slotselect{{/slot-ab}},avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount
system /system ext4 ro,barrier=1 wait{{#slot-ab}},slotselect{{/slot-ab}},avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount
{{/dynamic-partitions}}
{{^dynamic-partitions}}
/dev/block/by-name/system /{{^slot-ab}}system{{/slot-ab}} {{system_fs}} ro wait{{#slot-ab}},slotselect{{/slot-ab}},avb
Expand Down
2 changes: 1 addition & 1 deletion groups/boot-arch/project-celadon/gpt.ini
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ type = fat

[partition.boot]
label = boot
len = 41
len = 45
type = boot
{{#slot-ab}}
has_slot = true
Expand Down
4 changes: 2 additions & 2 deletions groups/thermal/thermal-daemon/init.rc
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ on post-fs-data
setprop persist.vendor.thermal.mode thermal-daemon
mkdir /data/vendor/thermal-daemon 0660 system system

on property:sys.boot_completed=1 && property:vendor.thermal.enable=1
start thermal-daemon
# on property:sys.boot_completed=1 && property:vendor.thermal.enable=1
# start thermal-daemon