Commit graph

56191 commits

Author SHA1 Message Date
Automerger Merge Worker
23d4c35a72 Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots" am: afb6b354a9
Change-Id: I866142e641e46f9ed30cb0393825a1797d2f30c9
2020-02-01 12:37:12 +00:00
Treehugger Robot
afb6b354a9 Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots" 2020-02-01 12:22:38 +00:00
Automerger Merge Worker
ebdf08318f Merge changes from topic "libmetricslogger" am: de6a99d702
Change-Id: Id4354ba024b98631a3d3ee4bc638d9c17586a872
2020-02-01 07:00:53 +00:00
Automerger Merge Worker
47b061795d Remove libmetricslogger dependency from bootstats am: fe0b389190
Change-Id: Ibf52227cd46b8616de79b69d6e62fe9f7eaff4d3
2020-02-01 07:00:51 +00:00
Automerger Merge Worker
73a3552047 Merge "Check /sys/kernel/tracing for tracefs" am: a6c834f960
Change-Id: Ied26985b145eea03815c384bd225594dda7710e9
2020-02-01 07:00:29 +00:00
Howard Ro
de6a99d702 Merge changes from topic "libmetricslogger"
* changes:
  Deprecate libmetricslogger
  Remove libmetricslogger dependency from bootstats
2020-02-01 06:56:38 +00:00
Treehugger Robot
a6c834f960 Merge "Check /sys/kernel/tracing for tracefs" 2020-02-01 06:50:45 +00:00
Howard Ro
327240192b Deprecate libmetricslogger
There's no more usage of libmetricslogger.

Bug: 147777989
Test: compiles and confirmed that there's no usage of it
Merged-In: Ie990f7f1651b7717f21553481dc8635a01993777
Change-Id: Ie990f7f1651b7717f21553481dc8635a01993777
2020-01-31 17:52:12 -08:00
Automerger Merge Worker
44f912a654 Merge "symlink /dev/net/tun -> ../tun" am: 8fda5feb25
Change-Id: I41f02949c240e0a581d0e87b35181644f4faa50f
2020-02-01 01:39:49 +00:00
Howard Ro
fe0b389190 Remove libmetricslogger dependency from bootstats
These are either already migrated or are planned to be migrated to
statsd.

Bug: 147777989
Bug: 148575354
Test: compiles
Merged-In: I00b110dcf5cf4a0fb1673fe05004662b6f3327d0
Change-Id: I00b110dcf5cf4a0fb1673fe05004662b6f3327d0
2020-01-31 17:39:02 -08:00
Maciej Żenczykowski
8fda5feb25 Merge "symlink /dev/net/tun -> ../tun" 2020-02-01 01:24:57 +00:00
Automerger Merge Worker
6e9e22711f Merge "Rename key_dir to metadata_key_dir and refactor" am: 60a55d91dc
Change-Id: Id85b38917e611199515ffdd795ca384cc4e04e13
2020-01-31 21:59:05 +00:00
Paul Crowley
60a55d91dc Merge "Rename key_dir to metadata_key_dir and refactor" 2020-01-31 21:49:13 +00:00
Automerger Merge Worker
3a48594926 Merge "libbase: Have LogdLogger use LOGGER_ENTRY_MAX_PAYLOAD for its buffer" am: 2f6f86ff72
Change-Id: Ib5c09e710bc16dd473ec26e75371fd2080f2bf43
2020-01-31 21:15:00 +00:00
Tom Cherry
2f6f86ff72 Merge "libbase: Have LogdLogger use LOGGER_ENTRY_MAX_PAYLOAD for its buffer" 2020-01-31 21:03:31 +00:00
Tom Cherry
42ee2e4f8f libbase: Have LogdLogger use LOGGER_ENTRY_MAX_PAYLOAD for its buffer
LogdLogger has its own buffer for adding the file and line number to
FATAL messages, but it is much lower than LOGGER_ENTRY_MAX_PAYLOAD and
that causes problems now that more logs are piped through this logger,
so increase the limit to maximum.

Also, in the case that the file and line number are not added, simply
pass the buffer through to liblog, since there is no reason to copy to
a separate buffer.

Bug: 148678509
Test: build, unit tests
Change-Id: I064aa34641e784dca6c529c51cb192069821d64a
2020-01-31 20:01:47 +00:00
Automerger Merge Worker
413bb44e3d Merge "Mount binderfs" am: 938379de5b
Change-Id: I87c9b9744cde4df1a2d7dfb691de472f78903390
2020-01-31 18:48:42 +00:00
Treehugger Robot
938379de5b Merge "Mount binderfs" 2020-01-31 18:46:14 +00:00
Automerger Merge Worker
62ee7ec4d9 Merge "Allow LOG_ALWAYS_FATAL_IF in constexpr functions" am: e2a1705f1f
Change-Id: Ifcbe6cfc745161c7efde932ca28d557698a03d40
2020-01-31 18:38:00 +00:00
Chih-hung Hsieh
e2a1705f1f Merge "Allow LOG_ALWAYS_FATAL_IF in constexpr functions" 2020-01-31 18:15:06 +00:00
Automerger Merge Worker
2edb1355d5 Merge "Whitelist reboot reasons related to userspace reboot failure" am: abe52dcb88
Change-Id: I8716d3b868b7142049329aa9cdc15b6f37c1abac
2020-01-31 16:24:42 +00:00
Automerger Merge Worker
7eb8d544a8 Merge "Skip snapshot tests for non-Virtual A/B devices" am: d7c1bc73dc
Change-Id: If7038e078719954f87675ddcc6395da802ab8a78
2020-01-31 16:13:55 +00:00
Automerger Merge Worker
43f9d449b9 Merge "adb: make the push summary fit in 80 columns." am: b2066fda6d
Change-Id: I3c8753cac90f85d91c37ee2224b6acf26d33ec2c
2020-01-31 16:11:50 +00:00
Automerger Merge Worker
84c79e4e15 Merge "Creating logical and snapshot partitions uses timeout in tests" am: 274bd807a6
Change-Id: I374a5f77c951db18a8daa50104f39471f8a2b25d
2020-01-31 16:09:32 +00:00
Automerger Merge Worker
fb4209d8ee Merge "Correct /sys/kernel/tracing permissions" am: 1fad2b39a3
Change-Id: I699781e70a86357bd77f268d8b3264ac0a04ce72
2020-01-31 16:08:59 +00:00
Nikita Ioffe
abe52dcb88 Merge "Whitelist reboot reasons related to userspace reboot failure" 2020-01-31 15:11:12 +00:00
Hridya Valsaraju
6a879b25d9 Check /sys/kernel/tracing for tracefs
When debugfs is not mounted, atrace should look for
tracefs in /sys/kernel/tracing.

Test: CtsAtraceHostTestCases
Bug: 148436518
Change-Id: I45c0e664892bcda277fd9612106ad5216aea0a1b
2020-01-30 17:38:51 -08:00
Paul Crowley
7823e327c1 Rename key_dir to metadata_key_dir and refactor
Bug: 147814592
Test: Crosshatch boots
Change-Id: I18b03486d2e93c6103880d1af68d9f70147fde63
2020-01-30 16:03:45 -08:00
Treehugger Robot
d7c1bc73dc Merge "Skip snapshot tests for non-Virtual A/B devices" 2020-01-30 23:49:19 +00:00
Alessio Balsini
fb5de5bc8f Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots
In a device with malformed metadata, the MetadataBuilder returns a
nullptr that may cause segmentation faults when using the builder.
Fix by handling the nullptr exception in CreateUpdateSnapshot and
propagating the error to its caller.

Bug: n/a
Test: libsnapshot_test
Change-Id: Ie9148a552cf4bb223ab8d54b1d30d2b13d92bb22
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-30 22:42:54 +00:00
Automerger Merge Worker
9e3a7c41c2 Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" am: 838b1a1f94
Change-Id: Iad848705749bfcf5725f9532f00009517cb5355c
2020-01-30 18:14:40 +00:00
Automerger Merge Worker
8c2a9e8df3 Merge "Dependency cleanup for snapshot .bp" am: 68acec7723
Change-Id: I6dbf163c1649a503bc706c820a358d67bb33cf16
2020-01-30 18:13:21 +00:00
Automerger Merge Worker
88b99fbda4 Merge "Revive ACgroupController_getFlags LLNDK function to detect missing cgroups" am: 77840a1877
Change-Id: If7d0d03e7b055919f25ad7882dd69ecaf7e78568
2020-01-30 18:12:01 +00:00
Automerger Merge Worker
4eb7ba464e Merge "libsnapshot_test runs as root" am: 30abf7a9fc
Change-Id: I14c82cae7ec7b1c808340e7cbc4af94e0c4076a3
2020-01-30 18:09:53 +00:00
Automerger Merge Worker
ae02308fef Merge "set-verity-state: Link to libfs_mgr_binder." am: c335a34f6b
Change-Id: I1215ad0293017e93ce75a18ca6b659d07cc48d2a
2020-01-30 18:02:24 +00:00
Automerger Merge Worker
563e1b6a99 Merge "remount: Use /data for backing scratch storage." am: 21dcbd15bc
Change-Id: I8ab5ad02a2ae1e465cb300c106ee6d5967506da8
2020-01-30 18:02:21 +00:00
Chih-Hung Hsieh
9911e28043 Allow LOG_ALWAYS_FATAL_IF in constexpr functions
* When __FAKE_USE_VA_ARGS has args that are not constexpr,
  reaching it in a constexpr function will be make the
  constexpr function invalid.
  To allow LOG_ALWAYS_FATAL_IF in a constexpr functions when
  the tested condition is false, it should call __FAKE_USE_VA_ARGS
  only when the tested condition is true.
* Other ALOG*_IF macros are also changed to call
  __FAKE_USE_VA_ARGS only when the tested condition is true.

Bug: 148548418
Test: WITH_TIDY=1 make
Change-Id: Ie8a444dffbf9cbef78e5e0b49b44f4092bcf9982
2020-01-30 09:39:50 -08:00
Alessio Balsini
fce02741d3 Skip snapshot tests for non-Virtual A/B devices
The libsnapshot features are currently not used anywhere else than the
update system with Virtual A/B.
Ignore libsnapshot tests for devices that are not implementing this
feature.

Test: m, snapshot_test, OTA
Bug: 142513589
Change-Id: I4580bae5ed315f21501556eea062e6af1f982ab3
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-30 16:23:27 +00:00
Elliott Hughes
b2066fda6d Merge "adb: make the push summary fit in 80 columns." 2020-01-30 16:01:01 +00:00
Maciej Żenczykowski
00a21e3d54 symlink /dev/net/tun -> ../tun
This is the expected location on Linux and this makes 'ip tuntap' work.

Before:
  vsoc_x86_64:/ # ip tuntap add dev tun0 mode tun
  open: No such file or directory
  vsoc_x86_64:/ # ip tuntap add dev tap0 mode tap
  open: No such file or directory
  vsoc_x86_64:/ # ip tuntap list

After:
  vsoc_x86_64:/ # ip tuntap add dev tun0 mode tun
  vsoc_x86_64:/ # ip tuntap add dev tap0 mode tap
  vsoc_x86_64:/ # ip tuntap list
  tap0: tap UNKNOWN_FLAGS:800
  tun0: tun UNKNOWN_FLAGS:800

  $ adbz shell ls -ldZ / /dev /dev/tun /dev/net /dev/net/tun
  drwxr-xr-x 25 root   root u:object_r:rootfs:s0         4096 2020-01-25 09:48 /
  drwxr-xr-x 21 root   root u:object_r:device:s0         1240 2020-01-25 09:48 /dev
  drwxr-xr-x  2 root   root u:object_r:device:s0           60 2020-01-25 09:48 /dev/net
  lrwxrwxrwx  1 root   root u:object_r:device:s0            6 2020-01-25 09:48 /dev/net/tun -> ../tun
  crw-rw----  1 system vpn  u:object_r:tun_device:s0  10, 200 2020-01-25 09:48 /dev/tun

Test: see above
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2aa215711454ce4f8a0ef1f34c17621629060fa1
2020-01-30 03:51:33 +00:00
Treehugger Robot
274bd807a6 Merge "Creating logical and snapshot partitions uses timeout in tests" 2020-01-30 02:57:25 +00:00
Hridya Valsaraju
8e50be74ae Mount binderfs
Mount binderfs at /dev/binderfs. Also add symlinks from /dev/binder,
/dev/hwbinder and /dev/vndbinder to /dev/binderfs/binder,
/dev/binderfs/hwbinder and /dev/binderfs/vndbinder respectively.

Bug: 136497735
Test: Cuttlefish boots on Android Common Kernel 4.19 with kernel config
CONFIG_ANDROID_BINDERFS=y.

Change-Id: I349face22a2e73bfd79af0188e41188c323388f7
2020-01-29 17:59:17 -08:00
Alistair Delva
1fad2b39a3 Merge "Correct /sys/kernel/tracing permissions" 2020-01-30 00:08:02 +00:00
David Anderson
838b1a1f94 Merge "fs_mgr: Fix MapScratchPartitionIfNeeded signature" 2020-01-29 22:48:08 +00:00
Treehugger Robot
68acec7723 Merge "Dependency cleanup for snapshot .bp" 2020-01-29 20:55:03 +00:00
Luca Stefani
32835b3967 fs_mgr: Fix MapScratchPartitionIfNeeded signature
Test: lunch aosp_x86_64-user; m

Change-Id: I0cd9be80baab664dd374593c1a4f45cea6a0cc78
2020-01-29 20:58:06 +01:00
Treehugger Robot
77840a1877 Merge "Revive ACgroupController_getFlags LLNDK function to detect missing cgroups" 2020-01-29 18:50:12 +00:00
Treehugger Robot
30abf7a9fc Merge "libsnapshot_test runs as root" 2020-01-29 18:43:53 +00:00
Alessio Balsini
153ccacfb6 Creating logical and snapshot partitions uses timeout in tests
CreateLogicalAndSnapshotPartition is used in first-stage init and by
default never blocks (thanks to a timeout set to 0).  This causes some
libsnapshot tests to fail, because snapshot devices may be accessed
before there actual creation is complete.
Fix by introducing a timeout_ms argument, set to 0 if unspecified.

Test: libsnapshot_test
Bug: 142513589
Change-Id: I5e23adaaf6df8603df501b9a25fdd1e9d8c15252
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-01-29 18:24:50 +00:00
David Anderson
c335a34f6b Merge "set-verity-state: Link to libfs_mgr_binder." 2020-01-29 17:55:06 +00:00