Commit graph

84114 commits

Author SHA1 Message Date
Treehugger Robot
0b835794c3 Merge "Load kernel modules from /lib/modules/uname -r_$(page_size) if present" into main am: d4e75d578b am: 41d7f15c4d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2717339

Change-Id: I24ccbea53c8e7f56a5ab2c74d21026ee872ede2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:44:51 +00:00
Treehugger Robot
41d7f15c4d Merge "Load kernel modules from /lib/modules/uname -r_$(page_size) if present" into main am: d4e75d578b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2717339

Change-Id: I9295551c587be853bb24741b6b8c8eaf79b29d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:06:48 +00:00
Treehugger Robot
1937311500 Merge "libfs_avb: Allow overriding the slot suffix." into main am: 30b1c4dd3b am: 8e60a8d6db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2587226

Change-Id: I4fce6d31b506be94f7d1fe315884d0775c05da19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:35:31 +00:00
Treehugger Robot
d4e75d578b Merge "Load kernel modules from /lib/modules/uname -r_$(page_size) if present" into main 2023-08-21 20:23:01 +00:00
Treehugger Robot
8e60a8d6db Merge "libfs_avb: Allow overriding the slot suffix." into main am: 30b1c4dd3b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2587226

Change-Id: I88647c162a1bdf4ec3bcf9564ffc6fa2b60ec762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:00:57 +00:00
Treehugger Robot
30b1c4dd3b Merge "libfs_avb: Allow overriding the slot suffix." into main 2023-08-21 19:12:16 +00:00
Kelvin Zhang
d479afa037 Load kernel modules from /lib/modules/uname -r_$(page_size) if present
To support booting from both 4k/16k kernels, init need to tell which
kernel we are currently booting and load the right modules. To resolve
this issue, we store 16K modules into /lib/modules/`uname -r`_16k
directory.

Test: th
Bug: 293313353
Change-Id: I4a8296384537a71e16cd20e76e6c5dfb9074f574
2023-08-18 17:04:39 -07:00
Treehugger Robot
80c8c7f404 Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123 am: 5dd9d64608
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2715844

Change-Id: Ieba0cba3fe15a21290ea4535c8649c486d305b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 00:47:04 +00:00
Treehugger Robot
5dd9d64608 Merge "Fix uninitialized var compiler warnings" into main am: d1e04d2123
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2715844

Change-Id: I120e30d5e8d9c77cef78375fde27686846cceb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 00:19:51 +00:00
Treehugger Robot
d1e04d2123 Merge "Fix uninitialized var compiler warnings" into main 2023-08-17 23:49:18 +00:00
Daniel Zheng
0ce656e198 Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9fc am: 22e446746e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710360

Change-Id: I87e8af53582bdac271ef4526f75cfb10900ca824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 23:17:37 +00:00
Daniel Zheng
22e446746e Merge changes I5032300e,Idec3e051,I09be447b into main am: 4215f1a9fc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710360

Change-Id: If9c8e8ae975fdfb2b85fd8dd711a593d2d196364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 22:48:56 +00:00
Daniel Zheng
4215f1a9fc Merge changes I5032300e,Idec3e051,I09be447b into main
* changes:
  ZSTD read from wrong buf
  Fix warning
  Fix zstd optimization api usage
2023-08-17 22:32:35 +00:00
Kelvin Zhang
4b503b968c Fix uninitialized var compiler warnings
Test: th
Bug: 293313353
Change-Id: I87420a21a9c2ce1987179bf70767ea15b26cd5a5
2023-08-17 15:12:49 -07:00
Daniel Zheng
36882e98b4 ZSTD read from wrong buf
Fix zstd to read from ignore_buf rather than buf since that is where we
are first copying the date

Test: zstd ota
Change-Id: I5032300e4628ecd7e49f1fa9f76dc9a828fb58e6
2023-08-17 14:18:56 -07:00
Daniel Zheng
21aab6cb83 Fix warning
remove some unused headers and fix warning: Moving a temporary object prevents copy elision

Test: m libsnapshot
Change-Id: Idec3e051837dab5f1b95e677d1cdb09e9a57e73e
2023-08-17 14:18:56 -07:00
Daniel Zheng
96b78feec1 Fix zstd optimization api usage
ZSTD_c_windowLog should be set as log base 2 of max block size. Changing
hardcoded value to be determined by this variable.

Test: m libsnapshot
Change-Id: I09be447b7f1e95cb72a6a42eddb4035f61a43aad
2023-08-17 14:18:55 -07:00
Daniel Zheng
4e90f52b71 Merge "Removing extra string creation for log" into main am: 7bb24d3274 am: ad63042958
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2708333

Change-Id: I0101666a4bb6403d37537e7e824430a084a8c6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 20:08:11 +00:00
Daniel Zheng
ad63042958 Merge "Removing extra string creation for log" into main am: 7bb24d3274
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2708333

Change-Id: I18b8ce294dc0c083f2a054c4bd35a76dad6418b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 19:13:22 +00:00
Daniel Zheng
7bb24d3274 Merge "Removing extra string creation for log" into main 2023-08-17 18:19:10 +00:00
Tomasz Wasilczyk
604233aaee Merge "Revert "Revert "Remove cutils threads.h header completely.""" into main am: c05fd258ee am: 37f0b26947
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2713394

Change-Id: I31bc04ef04737443b1c19f9bb5158e2f234bbae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:32:24 +00:00
Tomasz Wasilczyk
37f0b26947 Merge "Revert "Revert "Remove cutils threads.h header completely.""" into main am: c05fd258ee
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2713394

Change-Id: I14eeb6ae7d08d474bc1c55b09354f3ef3e79f0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:50:11 +00:00
Tomasz Wasilczyk
c05fd258ee Merge "Revert "Revert "Remove cutils threads.h header completely.""" into main 2023-08-17 00:05:39 +00:00
Tomasz Wasilczyk
6cf9cd0123 Revert "Revert "Remove cutils threads.h header completely.""
This reverts commit c37838eec8.

Reason for revert: b/296247274 root-cause fixed

Change-Id: I859e7500a1dd09e3a66986cda9e62adf5d7a524a
2023-08-16 22:37:14 +00:00
Bruce Po
d79550d8fe Merge "Revert "Remove cutils threads.h header completely."" into main am: ef2cae13e8 am: 996bc30a27
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2712413

Change-Id: Ie157821472a5387f41ce8e005184636788412611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:11:13 +00:00
Bruce Po
996bc30a27 Merge "Revert "Remove cutils threads.h header completely."" into main am: ef2cae13e8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2712413

Change-Id: I2d3c1dd6bdb4e2f2cc34d68204eecb5ec923dfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:28:22 +00:00
Suren Baghdasaryan
3e01b70cdb [automerger skipped] libprocessgroup: optimize SetAttributeAction::ExecuteForProcess performance am: 1e81ee1363 -s ours
am skip reason: Merged-In I02e3046bd85d0dfebc68ab444f1796bb54cc69c7 with SHA-1 3483798fd9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271776

Change-Id: I15f44124d98cec700e5d9b1adcbb04029d847efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:28:21 +00:00
Suren Baghdasaryan
dd6fe056ed [automerger skipped] libprocessgroup: fix reset of file_v2_name am: 72254810d9 -s ours
am skip reason: Merged-In I5b33ca47b4fa5cabf582c8804bd13f72f6e58411 with SHA-1 3507846872 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24271775

Change-Id: Ia23a70becc20a4605a01442d08bc062fda018383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:28:16 +00:00
Bruce Po
ef2cae13e8 Merge "Revert "Remove cutils threads.h header completely."" into main 2023-08-16 17:47:29 +00:00
Bruce Po
c37838eec8 Revert "Remove cutils threads.h header completely."
This reverts commit d3550e3314.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-qpr-dev-plus-aosp&target=aosp_sunfish-userdebug&lkgb=10667572&lkbb=10667604&fkbb=10667601, bug http://b/296247274

Change-Id: I3f3864dc21fcb34cbb2ff524c43c3d92bd260ff6
BUG: 296247274
2023-08-16 17:38:09 +00:00
Treehugger Robot
e408e7aaea Merge "Remove cutils threads.h header completely." into main am: 4ed0e12d55 am: b1f6f92dc2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702415

Change-Id: I43e0e1077db9b74632bf1d626829054c6db679bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:20:59 +00:00
Treehugger Robot
b1f6f92dc2 Merge "Remove cutils threads.h header completely." into main am: 4ed0e12d55
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2702415

Change-Id: Iea316bc03c90089cd556546772587eed0e9442cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 16:36:26 +00:00
Treehugger Robot
4ed0e12d55 Merge "Remove cutils threads.h header completely." into main 2023-08-16 15:22:57 +00:00
Snehal Koukuntla
020c80f364 Merge "Change name to trusty-coverage-controller" into main am: 7cc9edd55c am: be0539819c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705253

Change-Id: Ic786665c07fe734e7bd51cbf6295ef193370b68b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 10:29:34 +00:00
Snehal Koukuntla
be0539819c Merge "Change name to trusty-coverage-controller" into main am: 7cc9edd55c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2705253

Change-Id: Ib6fe43f4f69d7148443c28d1b4ffe34b9d716b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 09:45:22 +00:00
Snehal Koukuntla
7cc9edd55c Merge "Change name to trusty-coverage-controller" into main 2023-08-16 09:15:09 +00:00
Snehal
b702fddd2e Change name to trusty-coverage-controller
Test: builds and passes tests

Bug: None

Change-Id: I89eec23312f79f4da43c491ce58aa4f246c7ab34
2023-08-16 09:14:32 +00:00
Treehugger Robot
9ea6d8b9ea Merge "Update OWNERS." into main am: c70a336e60 am: 1f56fb43cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710977

Change-Id: I79f2906c24467323f19ec5f2d5faaa04ebe17ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 00:01:05 +00:00
Treehugger Robot
1f56fb43cf Merge "Update OWNERS." into main am: c70a336e60
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2710977

Change-Id: I20bad4aeed4670cfa33d8a82b1c3f1a15871359a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 23:16:52 +00:00
Treehugger Robot
c70a336e60 Merge "Update OWNERS." into main 2023-08-15 22:18:35 +00:00
David Anderson
8d9940bdaf Update OWNERS.
Change-Id: Ib069b181fd48d73e5320f44c435b8814f269d291
2023-08-15 15:14:01 -07:00
Daniel Zheng
e52a50ffed Merge changes I3feede9f,I9194e2c6 into main am: 74295d4f10 am: 5efbf813f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700798

Change-Id: I88d0332a8604e2e78a7da0c2110135a1f990a8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 17:47:43 +00:00
Treehugger Robot
0ef8ec991a Merge "Add mikemcternan@ to OWNERS" into main am: 49dc9d1233 am: 149b82eabb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692687

Change-Id: I406bcaed6e5f3ce9b08632b31cd2b65fa238d8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 17:46:29 +00:00
Daniel Zheng
5efbf813f3 Merge changes I3feede9f,I9194e2c6 into main am: 74295d4f10
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2700798

Change-Id: I4898de58e42dcd6c71233d23accb42d66f81c619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 17:06:54 +00:00
Treehugger Robot
149b82eabb Merge "Add mikemcternan@ to OWNERS" into main am: 49dc9d1233
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2692687

Change-Id: I9e44d71bf0780986ae6e1befa21f4efcf3f1bdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 17:06:05 +00:00
Daniel Zheng
74295d4f10 Merge changes I3feede9f,I9194e2c6 into main
* changes:
  Optimize zstd compression
  Adding compressor class
2023-08-15 16:33:31 +00:00
Treehugger Robot
49dc9d1233 Merge "Add mikemcternan@ to OWNERS" into main 2023-08-15 16:21:57 +00:00
Daniel Zheng
03acfdbeb6 Optimize zstd compression
reuse the same context for zstd compression. One context should be used
per compression thread for optimal performance. Discussion and
reccomendations can be found at go/android-hw-compression-vendor

Results (level 3 compression)
full ota on raven with optimizations:  1191.304 seconds
without optimizations:  1461.854 seconds

compression ratio remains unchanged and merge time difference are
negligible ~1% delta (probably just noise)

Test: ota_from_target_files, update_device.py
Change-Id: I3feede9f1f119874e369c54b29c594475fbf7376
2023-08-14 16:07:33 -07:00
Daniel Zheng
de6e446efa Adding compressor class
Adding in compressor class to clean up code for cow_compress.cpp.
Since we are making some api changes (to zstd) that are unique to each
compression methods, these should be implementation details should be
hidden to the parent class

Test: m libsnapshot

Change-Id: I9194e2c615aefed078458f525382253228bc1b69
2023-08-14 16:07:26 -07:00
Daniel Zheng
90d4f89e8b Removing extra string creation for log
Removin unneccessary string from being created in logging

Test: m libsnapshot
Change-Id: I123b6a10f349dfb0c275e630b5f02d1cec8c2687
2023-08-14 15:16:36 -07:00