diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 20:46:14 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 20:46:14 -0600 |
| commit | 8715e68d169854a16f4ef16649b834739494bf89 (patch) | |
| tree | 708c736473c0434a9ba707517f344107f0ae299f /rootdir | |
| parent | 6ec9b91220c9a8e8073a35aaf933a2a98fa371ad (diff) | |
| parent | 41f8654b7210971d617de9846482fd893069b41b (diff) | |
| download | system_core-8715e68d169854a16f4ef16649b834739494bf89.tar.gz system_core-8715e68d169854a16f4ef16649b834739494bf89.tar.bz2 system_core-8715e68d169854a16f4ef16649b834739494bf89.zip | |
Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37
Android 10.0.0 Release 37 (QQ3A.200605.001)
* tag 'android-10.0.0_r37':
Add cpu-set properties to serializer test
Allowing R and S developer GSI for DSU
Adding new GSI public keys
Increase timeouts.
Add TEMP_FAILURE_RETRY where appropriate.
Increase timeout to avoid flaky tests.
configs for jailed procs to dump code coverage data
Move gcov output to /data/misc/trace
rootdir: init.rc to limit discard size to 128MB
Change-Id: I402131a51320e548dfd105d2223423e14a9e8ec4
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 2 | ||||
| -rw-r--r-- | rootdir/avb/Android.mk | 30 | ||||
| -rw-r--r-- | rootdir/avb/r-developer-gsi.avbpubkey | bin | 0 -> 1032 bytes | |||
| -rw-r--r-- | rootdir/avb/s-developer-gsi.avbpubkey | bin | 0 -> 1032 bytes | |||
| -rw-r--r-- | rootdir/init.rc | 5 |
5 files changed, 36 insertions, 1 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 7ff1588b2..24b39991a 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -89,7 +89,7 @@ endif EXPORT_GLOBAL_GCOV_OPTIONS := ifeq ($(NATIVE_COVERAGE),true) - EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/gcov + EXPORT_GLOBAL_GCOV_OPTIONS := export GCOV_PREFIX /data/misc/trace endif # Put it here instead of in init.rc module definition, diff --git a/rootdir/avb/Android.mk b/rootdir/avb/Android.mk index 80573fb37..f96ffddb3 100644 --- a/rootdir/avb/Android.mk +++ b/rootdir/avb/Android.mk @@ -46,6 +46,21 @@ endif include $(BUILD_PREBUILT) ####################################### +# r-developer-gsi.avbpubkey +include $(CLEAR_VARS) + +LOCAL_MODULE := r-developer-gsi.avbpubkey +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb +else +LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb +endif + +include $(BUILD_PREBUILT) + +####################################### # s-gsi.avbpubkey include $(CLEAR_VARS) @@ -59,3 +74,18 @@ LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb endif include $(BUILD_PREBUILT) + +####################################### +# s-developer-gsi.avbpubkey +include $(CLEAR_VARS) + +LOCAL_MODULE := s-developer-gsi.avbpubkey +LOCAL_MODULE_CLASS := ETC +LOCAL_SRC_FILES := $(LOCAL_MODULE) +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/avb +else +LOCAL_MODULE_PATH := $(TARGET_RAMDISK_OUT)/avb +endif + +include $(BUILD_PREBUILT) diff --git a/rootdir/avb/r-developer-gsi.avbpubkey b/rootdir/avb/r-developer-gsi.avbpubkey Binary files differnew file mode 100644 index 000000000..aac39cc86 --- /dev/null +++ b/rootdir/avb/r-developer-gsi.avbpubkey diff --git a/rootdir/avb/s-developer-gsi.avbpubkey b/rootdir/avb/s-developer-gsi.avbpubkey Binary files differnew file mode 100644 index 000000000..f0a6c11b8 --- /dev/null +++ b/rootdir/avb/s-developer-gsi.avbpubkey diff --git a/rootdir/init.rc b/rootdir/init.rc index 58a83e091..4e101a90e 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -687,6 +687,11 @@ on boot write /sys/fs/f2fs/${dev.mnt.blk.data}/cp_interval 200 write /sys/fs/f2fs/${dev.mnt.blk.data}/gc_urgent_sleep_time 50 + # limit discard size to 128MB in order to avoid long IO latency + # for filesystem tuning first (dm or sda) + # Note that, if dm-<num> is used, sda/mmcblk0 should be tuned in vendor/init.rc + write /sys/devices/virtual/block/${dev.mnt.blk.data}/queue/discard_max_bytes 134217728 + # Permissions for System Server and daemons. chown radio system /sys/android_power/state chown radio system /sys/android_power/request_state |