Commit graph

68338 commits

Author SHA1 Message Date
Devin Moore
786355f304 init: handle more bootconfig parameters am: 79058486d2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1615298

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a7250bb7c6a7694eb2431d31d9f104721a9507b
2021-03-08 18:44:30 +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
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
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
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
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
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
Devin Moore
79058486d2 init: handle more bootconfig parameters
As parameters are moved from kernel cmdline to bootconfig,
first_stage_init needs to be updated to handle the new
location.
/proc/bootconfig should be checked first, if not present, then check
/proc/cmdline.

Test: launch_cvd
Test: launch_cvd with 4.19 kernel artifacts that do not support
bootconfig
Test: Both of the above configurations with --num_instances 0 or 4
Test: Both configurations with androidboot.boot_devices or
androidboot.boot_device set
Bug: 173815685

Change-Id: I03743f922351d58375e8b9a903899b8bc54bd71e
2021-03-05 09:21:19 -08: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
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
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
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
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
Tri Vo
8adc962e71 Merge changes I1e1e2c70,I9c86a12c am: 24ad66e3db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1606536

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70a255106c46e25e8d4439cb674aa0716cc1ad60
2021-03-03 00:54:21 +00:00
Tri Vo
24ad66e3db Merge changes I1e1e2c70,I9c86a12c
* changes:
  trusty: Fuzzer for ConfirmationUI messages
  trusty: Use a simple TIPC fuzzer for ConfirmationUI
2021-03-03 00:05:02 +00:00
Treehugger Robot
50597bb4f5 Merge changes Ifcb52754,I29f79097 am: 9539282751
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1589734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ff8bc3a5286472c3216886d5976844d391756d0
2021-03-02 23:00:43 +00:00
Treehugger Robot
9539282751 Merge changes Ifcb52754,I29f79097
* changes:
  COW file size: better explain the exception size
  libsnapshot: COW size is computed within the container capability
2021-03-02 22:35:48 +00:00
Alexander Potapenko
08f0076160 Merge "init.rc: set up a tracing instance for BootReceiver.java" am: ef239b7517
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1572240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I133f4e1357cbfe7f2a2a0eb612292613c8ca6956
2021-03-02 22:26:30 +00:00
Tri Vo
64af1279fb Merge "trusty: Apploader fuzzer" am: 427706675c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1602493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f9fe393152e5dee8f96d724a495d5f9bbc14fba
2021-03-02 22:25:09 +00:00
David Anderson
67881fb4d1 Merge changes Idcb30151,I0f746870 am: 04502383f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1611274

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c8906d9523ab7d1217c40959954365c6e098883
2021-03-02 22:24:46 +00:00
Treehugger Robot
835640f275 Merge "libdebuggerd: delete unused code." am: d3ffa8acd5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1612830

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bc5ea741d87f51ea5eac643bb94f878e41f129a
2021-03-02 21:50:54 +00:00
Treehugger Robot
e80974742b Merge "[libprocessgroup] Use new jsoncpp API" am: ff02909cf7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1607098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96876a4e235a04bf8fbc7ae24dc834f15b9b3447
2021-03-02 21:50:47 +00:00
Treehugger Robot
900c6010e0 Merge "Detect the absence of the default fstab" am: d9b7c9b4a7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1607906

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f5b467eab74cc86c525a09210811e51459dab97
2021-03-02 21:50:30 +00:00
Alexander Potapenko
ef239b7517 Merge "init.rc: set up a tracing instance for BootReceiver.java" 2021-03-02 20:45:51 +00:00