Commit graph

68529 commits

Author SHA1 Message Date
Kiyoung Kim
ce276e54ea Merge "Check if service is executed before APEX is ready" am: fcb28f5d30 am: 2acff0c5e8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1612017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd02ba4c5324828de9fb23e6db9bf89a347c51b
2021-03-08 01:01:32 +00:00
Kiyoung Kim
2acff0c5e8 Merge "Check if service is executed before APEX is ready" am: fcb28f5d30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1612017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4739d214cdc6af83cae6c2cde67d4ca5c4193443
2021-03-08 00:23:20 +00:00
Kiyoung Kim
fcb28f5d30 Merge "Check if service is executed before APEX is ready" 2021-03-07 23:56:06 +00:00
Alistair Delva
99231262e2 Merge "Fix Mac build." am: 478d0698bb am: bf5c501453
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1622119

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10fe1d2ec31dba83fb9e07c283d69c3090ad86c6
2021-03-07 00:06:48 +00:00
Alistair Delva
bf5c501453 Merge "Fix Mac build." am: 478d0698bb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1622119

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If503716832a7c675712aafbd7bf5c76c304ad337
2021-03-06 23:32:35 +00:00
Alistair Delva
478d0698bb Merge "Fix Mac build." 2021-03-06 23:04:18 +00:00
Treehugger Robot
7885c54b5e Merge "fastbootd: Fix USB transport data is repeated every 256K" am: fce8e0f4a4 am: 838badf91a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1604873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba3b694eb589cb9c359cb7022a4a2efc7c5f747f
2021-03-06 07:04:06 +00:00
Treehugger Robot
838badf91a Merge "fastbootd: Fix USB transport data is repeated every 256K" am: fce8e0f4a4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1604873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I769d04d51243132335778af9f4d4186e17f81419
2021-03-06 06:21:09 +00:00
Treehugger Robot
fce8e0f4a4 Merge "fastbootd: Fix USB transport data is repeated every 256K" 2021-03-06 05:50:50 +00:00
Yifan Hong
5f23388c7a fastbootd: Fix USB transport data is repeated every 256K
When Write() is called on data > 256K, the written data
repeats every 256K because of the buggy line in this change.

Test: fastboot fetch vendor_boot.img
Fixes: 180654366

Change-Id: I33b129de27000d3f32f284469998daf540d4f856
2021-03-05 19:45:00 -08:00
Treehugger Robot
10539003c2 Merge "Untag addresses in registers before looking up the mapping." am: 3f24fefe29 am: e1d8d0a0b2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1578504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fbbdc0a35a214abcd61fd9e543b306db74c6b5e
2021-03-06 03:40:11 +00:00
Treehugger Robot
e1d8d0a0b2 Merge "Untag addresses in registers before looking up the mapping." am: 3f24fefe29
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1578504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcdcf5a443c4fc0bac4e7f8c4e690c0426e22830
2021-03-06 03:20:33 +00:00
Treehugger Robot
3f24fefe29 Merge "Untag addresses in registers before looking up the mapping." 2021-03-06 02:41:05 +00:00
Yifan Hong
baa058589d Merge "bootstat: clarify unit." am: 294a13ae0d am: 63ef529575
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1616686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30649b63b13b44a43331cf30015e9aac69794d6e
2021-03-06 02:38:06 +00:00
Elliott Hughes
66bfb9adac Fix Mac build.
The Mac doesn't need fs_config (there's a `darwin: { enabled: false } }`
at the only caller), so stop trying to build it here rather than fix it
so it builds again.

Test: treehugger
Change-Id: I88d6b3a44b1ab823a419789d8545fcf10061079c
2021-03-05 17:58:28 -08:00
Yifan Hong
63ef529575 Merge "bootstat: clarify unit." am: 294a13ae0d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1616686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48109d2a8a68cf4804891fd3cd5ebba7b400b3c2
2021-03-06 01:56:26 +00:00
Yifan Hong
294a13ae0d Merge "bootstat: clarify unit." 2021-03-06 01:20:15 +00:00
Treehugger Robot
9ffa8533c3 Merge "Ban exit-time destructors in libcutils." am: 0b589672e9 am: bbc615ffbd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1619599

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I175cb83f3c2df2a3ae70009b70a23ec7e9f88d80
2021-03-05 22:35:43 +00:00
Treehugger Robot
3fb1a85148 Merge "Disallow exit-time destructors in libutils." am: 1c9f84edeb am: c83480e3f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1619600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic965e47d8d61e3807bfa20b397b54e03597b7b96
2021-03-05 22:31:45 +00:00
Treehugger Robot
bbc615ffbd Merge "Ban exit-time destructors in libcutils." am: 0b589672e9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1619599

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb4eb8fa5970aeb6b7e906d0d37e9405b6c23a28
2021-03-05 22:11:20 +00:00
Treehugger Robot
c83480e3f9 Merge "Disallow exit-time destructors in libutils." am: 1c9f84edeb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1619600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I125ce6074e48fd8b2a5afead024247a20b987c37
2021-03-05 22:11:07 +00:00
Treehugger Robot
0b589672e9 Merge "Ban exit-time destructors in libcutils." 2021-03-05 21:54:52 +00:00
Treehugger Robot
1c9f84edeb Merge "Disallow exit-time destructors in libutils." 2021-03-05 21:43:53 +00:00
Jim Pollock
7ef97f19b2 Merge "threads.h: avoid defining gettid on glibc >= 2.32" am: fdac598f63 am: 7776fd25e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1612939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5c90c4615b00bdfcf9011d34f66b5e0fba729de
2021-03-05 16:24:16 +00:00
Jim Pollock
7776fd25e1 Merge "threads.h: avoid defining gettid on glibc >= 2.32" am: fdac598f63
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1612939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3421d3a6c5b73a8f0ed32fb8bad8363193e32aec
2021-03-05 15:44:54 +00:00
Jim Pollock
fdac598f63 Merge "threads.h: avoid defining gettid on glibc >= 2.32" 2021-03-05 15:16:18 +00:00
Alexander Potapenko
e569b73c20 Merge "init.rc: set up a tracing instance for BootReceiver.java" am: 66b93e3328 am: f998808b85
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1614814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09763aa4912c9ca1f49ea8657032784e1f58781c
2021-03-05 14:07:29 +00:00
Alexander Potapenko
f998808b85 Merge "init.rc: set up a tracing instance for BootReceiver.java" am: 66b93e3328
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1614814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee164b18c2a5861bf3c3553a8875f4595a52df56
2021-03-05 13:22:48 +00:00
Alexander Potapenko
66b93e3328 Merge "init.rc: set up a tracing instance for BootReceiver.java" 2021-03-05 13:01:36 +00:00
Adrian Ratiu
a742158667 threads.h: avoid defining gettid on glibc >= 2.32
Glibc >=2.32 exposes a gettid() which clashes with libcutils
thread.h, so add a check to not expose it if building against
newer glibc (ChromiumOS will still use glibc 2.27 besides 2.32).

Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=1182060
Test: Builds without errors on both glibc 2.32 and 2.27.

Change-Id: Ib71fa1bc9fa185e3668002407dbed05a80c87740
2021-03-05 09:55:15 +00:00
Kiyoung Kim
0cbee0de2a Check if service is executed before APEX is ready
Any service which is executed when Runtime apex is mounted, but
linkerconfig is not updated can fail to be executed due to missing
information in ld.config.txt. This change updates init to have a status
variable which contains if current mount namespace is default
and APEX is not ready from ld.config.txt, and use bootstrap namespace if
it is not ready.

Bug: 181348374
Test: cuttlefish boot succeeded
Change-Id: Ia574b1fad2110d4e68586680dacbe6137186546e
2021-03-05 16:42:20 +09:00
Elliott Hughes
48a9eb49ee Disallow exit-time destructors in libutils.
There weren't any, but let's keep it that way.

Test: treehugger
Change-Id: I2a64eed47f41413a43c524af23b3070e5c2083a6
2021-03-04 09:46:23 -08:00
Elliott Hughes
527d71fd69 Ban exit-time destructors in libcutils.
We don't have any right now. Let's keep it that way.

Also remove a bunch of duplication/cruft in the build file.

Test: treehugger
Change-Id: I406985592c175f45660e87adb05231bce0804893
2021-03-04 09:18:19 -08:00
Alexander Potapenko
439608bfb0 init.rc: set up a tracing instance for BootReceiver.java
This instance will be used to monitor the error_report_end tracing
events sent by kernel tools in the case of a memory corruption.

Bug: 172316664
Bug: 181778620
Test: manual runs with KFENCE enabled
Signed-off-by: Alexander Potapenko <glider@google.com>
Change-Id: Ibc5cd3b60fb99030cc55db6b490d6d4bbbca3963
2021-03-04 10:36:51 +01:00
David Anderson
f242e605f7 Merge "libsnapshot: Use the compression algorithm specified in the DeltaArchiveManifest." am: 3aab337293 am: eb27c7e761
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1607178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09c0e32da03812f0c80f71ef86cf95b74fd4ba06
2021-03-04 04:41:26 +00:00
David Anderson
eb27c7e761 Merge "libsnapshot: Use the compression algorithm specified in the DeltaArchiveManifest." am: 3aab337293
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1607178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bba512d2bc66ff71c911e547aa9e4e9ed5aa915
2021-03-04 04:22:33 +00:00
Wonsik Kim
1fbbfa741a Merge "Revert "init.rc: set up a tracing instance for BootReceiver.java"" am: e886702132 am: c5cf525364
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1615475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffa470b67902c82a0503d4894a4155057ba05ec9
2021-03-04 04:21:33 +00:00
David Anderson
3aab337293 Merge "libsnapshot: Use the compression algorithm specified in the DeltaArchiveManifest." 2021-03-04 03:05:43 +00:00
David Anderson
cbc204b39b libsnapshot: Use the compression algorithm specified in the DeltaArchiveManifest.
update_engine and libsnapshot must agree on CowOptions parameters,
otherwise the COW size estimation may be incorrect.

Bug: N/A
Test: vts_libsnapshot_test
      apply OTA, snapshotctl dump
Change-Id: I219ae458dfa19e4b3c96360d3b847edb2a01ebc8
2021-03-03 18:27:54 -08:00
Wonsik Kim
c5cf525364 Merge "Revert "init.rc: set up a tracing instance for BootReceiver.java"" am: e886702132
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1615475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdd1d59a3c1724ca179ee0067aa8707d29ac0e98
2021-03-04 02:09:55 +00:00
Yifan Hong
08ba15d143 bootstat: clarify unit.
Test: pass
Change-Id: I7fc5cf9a5ae8ff895e20922bc7266ef210e8659f
2021-03-03 17:13:34 -08:00
Wonsik Kim
e886702132 Merge "Revert "init.rc: set up a tracing instance for BootReceiver.java"" 2021-03-04 00:44:58 +00:00
George Burgess IV
4d69f2d72a Merge "snapuserd: fix a use of an uninitialized value" am: c08abac855 am: 4fd736ebc5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5714737fb545885b8b48c06fc42ab2214a7f4fa7
2021-03-03 23:51:27 +00:00
Xin Li
bcffc0ddf8 [automerger skipped] Merge "Merge RQ2A.210305.007" am: fd8bbd4820 -s ours am: f2d998d8dc -s ours
am skip reason: Change-Id I133f4e1357cbfe7f2a2a0eb612292613c8ca6956 with SHA-1 08f0076160 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb92b9938b9f07170aedfd84f32399a4c4165246
2021-03-03 23:37:15 +00:00
George Burgess IV
4fd736ebc5 Merge "snapuserd: fix a use of an uninitialized value" am: c08abac855
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28dada5583a7c98588e07b0b8c17ce5431fe3836
2021-03-03 23:31:52 +00:00
Wonsik Kim
5e53f90cdd Revert "init.rc: set up a tracing instance for BootReceiver.java"
Revert "Selinux policy for bootreceiver tracing instance"

Revert submission 1572240-kernel_bootreceiver

Reason for revert: DroidMonitor: Potential culprit for Bug 181778620 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
Ic1c49a695:init.rc: set up a tracing instance for BootReceive...
I828666ec3:Selinux policy for bootreceiver tracing instance

Change-Id: I5c2ccfe3eeb8863086b7cb9b3de43c6e076d995a
2021-03-03 22:47:02 +00:00
George Burgess IV
c08abac855 Merge "snapuserd: fix a use of an uninitialized value" 2021-03-03 22:43:36 +00:00
Xin Li
f2d998d8dc [automerger skipped] Merge "Merge RQ2A.210305.007" am: fd8bbd4820 -s ours
am skip reason: Change-Id I133f4e1357cbfe7f2a2a0eb612292613c8ca6956 with SHA-1 08f0076160 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c6b41c42d247d0889789ef9b5158ce4e7a23f2c
2021-03-03 22:29:29 +00:00
Xin Li
fd8bbd4820 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:39 +00:00
Xin Li
f3b0383b22 Merge RQ2A.210305.007
Bug: 180401296
Merged-In: I133f4e1357cbfe7f2a2a0eb612292613c8ca6956
Change-Id: I070347c7650410abf1f90a2d1ff4affe9e1eb76c
2021-03-03 09:12:27 -08:00