Yi-Yo Chiang
c519d1dde2
Merge "Revert "init_first_stage: Disable ThinLTO"" into main
2023-10-12 10:33:54 +00:00
Treehugger Robot
d6c1497116
[automerger skipped] Merge "Skip android14-tests-dev" into main am: f7d982ec7f
am: 57b575252f
-s ours am: 5423d6fa63
-s ours am: 7289d89e56
-s ours
...
am skip reason: Merged-In Iedb7c32a594c3b1fca2904f3441029aaed7edf2a with SHA-1 3a60e82512
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781831
Change-Id: I585c49a3dd0c174cdc9cd7e3427f2ddcf5ebca86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 08:22:43 +00:00
Treehugger Robot
7289d89e56
[automerger skipped] Merge "Skip android14-tests-dev" into main am: f7d982ec7f
am: 57b575252f
-s ours am: 5423d6fa63
-s ours
...
am skip reason: Merged-In Iedb7c32a594c3b1fca2904f3441029aaed7edf2a with SHA-1 3a60e82512
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781831
Change-Id: I0912946396b91a2a82b645b5f1ed8f8e4c2300af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 07:49:28 +00:00
Treehugger Robot
5423d6fa63
[automerger skipped] Merge "Skip android14-tests-dev" into main am: f7d982ec7f
am: 57b575252f
-s ours
...
am skip reason: Merged-In Iedb7c32a594c3b1fca2904f3441029aaed7edf2a with SHA-1 3a60e82512
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781831
Change-Id: I8ad16ba04befa767de25db51e307bec9d234eb69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 07:16:23 +00:00
Treehugger Robot
57b575252f
Merge "Skip android14-tests-dev" into main am: f7d982ec7f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781831
Change-Id: I8af9ae5f032388b1793571c234348a837768192d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 06:44:06 +00:00
Treehugger Robot
f7d982ec7f
Merge "Skip android14-tests-dev" into main
2023-10-12 06:06:07 +00:00
Raymond Hernandez
786aabd706
Add monicamwang and rayhdez to system/core/libstats/OWNERS
...
Test: m -j
Bug: N/A
Change-Id: Ifb866dc90818423260c8ff4337edaa2e622d9d56
2023-10-11 17:52:25 -07:00
Steven Moreland
6c4b394685
Merge "libutils: use log/log.h internally" into main am: cd9556cb96
am: 9debc02c5c
am: 28ca4e116d
am: 982aa049bd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2777584
Change-Id: I50d626c7220ba2cfbd07f704f812ecca5ff1e37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 00:21:49 +00:00
Steven Moreland
982aa049bd
Merge "libutils: use log/log.h internally" into main am: cd9556cb96
am: 9debc02c5c
am: 28ca4e116d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2777584
Change-Id: Ica1bca8a62421c0cec28c7100a62802005caa27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 23:48:16 +00:00
Kelvin Zhang
7aafe56a1d
Merge "Revert "Shove type into source_info"" into main am: d6fe3032a9
am: d69ab5d9ec
am: 9c9b7daade
am: 9089d65864
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781834
Change-Id: I9bd849e68627e6aa2aa931f2b5fb83783b1e1589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 23:16:00 +00:00
Steven Moreland
28ca4e116d
Merge "libutils: use log/log.h internally" into main am: cd9556cb96
am: 9debc02c5c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2777584
Change-Id: I33ba96fd45932caa41b99243d7a947598361b65f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 23:15:40 +00:00
Steven Moreland
9debc02c5c
Merge "libutils: use log/log.h internally" into main am: cd9556cb96
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2777584
Change-Id: I23742433478d8f401d12592dc45c6dff507d847e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 22:31:07 +00:00
Kelvin Zhang
9089d65864
Merge "Revert "Shove type into source_info"" into main am: d6fe3032a9
am: d69ab5d9ec
am: 9c9b7daade
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781834
Change-Id: I10248cadd97cb9c303acba1a4937dd9921400572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 22:30:16 +00:00
Steven Moreland
cd9556cb96
Merge "libutils: use log/log.h internally" into main
2023-10-11 22:02:18 +00:00
Kelvin Zhang
9c9b7daade
Merge "Revert "Shove type into source_info"" into main am: d6fe3032a9
am: d69ab5d9ec
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781834
Change-Id: I55bafd3ae59c62e6962cf889d244602e03299f72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:56:59 +00:00
Kelvin Zhang
d69ab5d9ec
Merge "Revert "Shove type into source_info"" into main am: d6fe3032a9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781834
Change-Id: I77f3709a59e66f0589327cfbec6a7e7dd3789e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 21:25:06 +00:00
Kelvin Zhang
d6fe3032a9
Merge "Revert "Shove type into source_info"" into main
2023-10-11 20:50:02 +00:00
Edward Liaw
fba487f9cf
Merge "liblp_test: Add to kernel-presubmit" into main am: da3caeab43
am: ec58b293ef
am: fdd5963326
am: 3529f4dd1e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782289
Change-Id: I5b33cfcd1d2b0b01bd508ea01f0c9d56e03f5068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:50:09 +00:00
Edward Liaw
bb337a402d
Merge "libdm_test: Add to kernel-presubmit" into main am: f5736cb42a
am: b79caadf21
am: 232bb99ab7
am: b8a1c7e055
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782288
Change-Id: I4e1bcc1022b196ba415237dc16563f2f70516c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:48:42 +00:00
Kelvin Zhang
b6153adde1
Revert "Shove type into source_info"
...
This reverts commit e90a39aee2
.
Reason for revert: 304602386
Change-Id: Ib9d31bdadc7511e67f4c7e5731d18e7bf0162bfc
2023-10-11 19:44:38 +00:00
Edward Liaw
3529f4dd1e
Merge "liblp_test: Add to kernel-presubmit" into main am: da3caeab43
am: ec58b293ef
am: fdd5963326
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782289
Change-Id: I9db558ab11db1fa57200a7d74274d90e5aafd6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:14:22 +00:00
Edward Liaw
b8a1c7e055
Merge "libdm_test: Add to kernel-presubmit" into main am: f5736cb42a
am: b79caadf21
am: 232bb99ab7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782288
Change-Id: I89e54187b14330785255d5d825c1f22853c01027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:13:59 +00:00
Edward Liaw
fdd5963326
Merge "liblp_test: Add to kernel-presubmit" into main am: da3caeab43
am: ec58b293ef
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782289
Change-Id: I4178ef3946b5d32f5189fce19f63f401e14cbfb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:19:02 +00:00
Edward Liaw
232bb99ab7
Merge "libdm_test: Add to kernel-presubmit" into main am: f5736cb42a
am: b79caadf21
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782288
Change-Id: I2ffa62845455560c7a027d49eebd358696c8b9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:18:43 +00:00
Nolen Johnson
cb33fb4008
fs_mgr: Don't run clean_scratch_files on non-dynamic devices
...
* This results in a metric ton of denials on some devices and
eats up valuable resources on boot, plus there's 0 need for it,
so kill it.
Change-Id: Ic52d5b3f06724430e9505345024cf0041b37ca49
2023-10-11 13:58:40 -04:00
Edward Liaw
ec58b293ef
Merge "liblp_test: Add to kernel-presubmit" into main am: da3caeab43
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782289
Change-Id: Ib24c6c837ceb4e2b0fb8632737e50b8a75b9cc69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:50:12 +00:00
Edward Liaw
b79caadf21
Merge "libdm_test: Add to kernel-presubmit" into main am: f5736cb42a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782288
Change-Id: Iaaed5422b94f6e970a9e684f007270f5b7980e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:48:17 +00:00
Edward Liaw
da3caeab43
Merge "liblp_test: Add to kernel-presubmit" into main
2023-10-11 16:53:26 +00:00
Edward Liaw
f5736cb42a
Merge "libdm_test: Add to kernel-presubmit" into main
2023-10-11 16:53:10 +00:00
Harry Pan
c000262b30
Merge "Add new fastbootd battery-soc variable" into main am: 06949876be
am: 7ec6046bb0
am: adfb606f18
am: baa2ca873a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2774590
Change-Id: I5dc87c0ae42323d26a2945ee5f2f2a898889de47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 03:35:08 +00:00
Harry Pan
baa2ca873a
Merge "Add new fastbootd battery-soc variable" into main am: 06949876be
am: 7ec6046bb0
am: adfb606f18
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2774590
Change-Id: Ic81a83189ee6b159cd1326bde065558b0dda403a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 02:49:17 +00:00
Harry Pan
adfb606f18
Merge "Add new fastbootd battery-soc variable" into main am: 06949876be
am: 7ec6046bb0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2774590
Change-Id: I37f473c41e3a47de8a16a3f5b56832b3d1f9823a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 02:15:30 +00:00
Yi-Yo Chiang
1a3dd7eb4b
Revert "init_first_stage: Disable ThinLTO"
...
This reverts commit 4d6fa8ccaf
.
Reason for revert: b/295944813 is fixed
Bug: 304290959
Change-Id: I2d6f5216800d6ee26b25623898836dc216c8be18
Test: adb-remount-test.sh
2023-10-11 02:06:26 +00:00
Daniel Zheng
5b5a98fb29
Merge changes Ibe310d58,If88dceda into main am: dd3d34ffa7
am: 4ff080089c
am: 55d95f02cc
am: e80608527c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782287
Change-Id: I4b52cd1f2cf4165dd2c815a4946a15ada1b06f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 01:24:32 +00:00
Harry Pan
7ec6046bb0
Merge "Add new fastbootd battery-soc variable" into main am: 06949876be
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2774590
Change-Id: If624275775c4c00e5495ac6202bc7e5ea59530d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 01:07:57 +00:00
Daniel Zheng
e80608527c
Merge changes Ibe310d58,If88dceda into main am: dd3d34ffa7
am: 4ff080089c
am: 55d95f02cc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782287
Change-Id: Iaa34b057d3ba691cb15b397e48f75b91e77a50a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:53:16 +00:00
Harry Pan
06949876be
Merge "Add new fastbootd battery-soc variable" into main
2023-10-11 00:28:28 +00:00
Daniel Zheng
55d95f02cc
Merge changes Ibe310d58,If88dceda into main am: dd3d34ffa7
am: 4ff080089c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782287
Change-Id: I0ed249dda19ee6d4e56d5f4f28cf93205b1d5956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:20:10 +00:00
Treehugger Robot
ce6512806d
Merge "rpc_binder: Change trusty_tipc_fuzzer
to support multiple connections and messages" into main am: c2671853ae
am: ab45061067
am: 1ba34689cd
am: 61d4349fb3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2737933
Change-Id: If7df58add6abae4cc79b3009e8ab917c7112be73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:18:41 +00:00
Daniel Zheng
65353d7000
Merge "Rename BLOCK_SZ to block_size" into main am: b3cd361bfd
am: dd4f283fa6
am: 2a0ee301ef
am: 5aea68df23
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781729
Change-Id: I68b26e413f4c88e70a20e5a52f35126a81be6603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:18:31 +00:00
Daniel Zheng
9c6e53b3d6
Merge "Move ReadCowHeader to CowReader" into main am: f5f0a10541
am: 2457e0b7e8
am: 9d67604c0d
am: 4156b81180
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781728
Change-Id: I60cf1a978324730ca95dbf54e693706ce0e6ecd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:18:21 +00:00
Daniel Zheng
0103d8e6db
Merge "Shove type into source_info" into main am: a3646037c2
am: 4833be3517
am: a961ebc25f
am: 296e077347
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2775834
Change-Id: Ib5edaed4cd7ddbf129e6ba32d399e3153136d818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 00:18:11 +00:00
Treehugger Robot
61d4349fb3
Merge "rpc_binder: Change trusty_tipc_fuzzer
to support multiple connections and messages" into main am: c2671853ae
am: ab45061067
am: 1ba34689cd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2737933
Change-Id: Ia5c9855cc3c2819f55306616670446f73456f911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:31:24 +00:00
Daniel Zheng
5aea68df23
Merge "Rename BLOCK_SZ to block_size" into main am: b3cd361bfd
am: dd4f283fa6
am: 2a0ee301ef
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781729
Change-Id: Ie9d74cb3f4da50de776f36c7902a6a6bf238b8fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:31:11 +00:00
Daniel Zheng
4156b81180
Merge "Move ReadCowHeader to CowReader" into main am: f5f0a10541
am: 2457e0b7e8
am: 9d67604c0d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781728
Change-Id: I737f6696221edf913cf84d89544c783908732741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:30:57 +00:00
Daniel Zheng
4ff080089c
Merge changes Ibe310d58,If88dceda into main am: dd3d34ffa7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2782287
Change-Id: I7b20669463ca407709cd0479783eab96071349e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:30:51 +00:00
Daniel Zheng
296e077347
Merge "Shove type into source_info" into main am: a3646037c2
am: 4833be3517
am: a961ebc25f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2775834
Change-Id: I9de7e20231806215a1c325b6ffb59bf769805329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 23:30:40 +00:00
Xin Li
8f3b94818a
Skip android14-tests-dev
...
Bug: 263910020
Merged-In: Iedb7c32a594c3b1fca2904f3441029aaed7edf2a
Change-Id: Ied477b08d7d23de298ace72ae7ee69dda7c0671b
2023-10-10 16:18:22 -07:00
Edward Liaw
eafffc0c9c
liblp_test: Add to kernel-presubmit
...
Bug: 284307085
Test: atest :kernel-presubmit
Change-Id: I2a138cf55a2af07b5c231f163196266f8b3dd524
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-10-10 23:13:30 +00:00
Edward Liaw
942a31e7be
libdm_test: Add to kernel-presubmit
...
Bug: 284307085
Test: atest :kernel-presubmit
Change-Id: I13ae25f17c943825bdf5ee67c00b7d297cf6e319
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-10-10 23:05:09 +00:00