Commit graph

68226 commits

Author SHA1 Message Date
Devin Moore
7e3beff24e Merge "Support bootconfig in first stage init and fs_mgr" am: cb4ebecbbd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1580792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5cdbb7f02f963b8316439f3f9d6c0d656503155
2021-02-24 16:40:07 +00:00
Devin Moore
cb4ebecbbd Merge "Support bootconfig in first stage init and fs_mgr" 2021-02-24 15:56:48 +00:00
Treehugger Robot
27e2d3d4fd Merge "Add docs to SystemClock.h" am: 0d4089cb1c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1603259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc4f3675aef646a2f8fa9e0dcc4cd0cdc56292fd
2021-02-24 01:45:29 +00:00
Chih-hung Hsieh
ada8c8a022 Merge "Add include directory to -header-filter" am: 06e1b6c3cc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597354

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3ec50bd9f273c9ccf1ea44953cccf4a57e0a10b
2021-02-24 01:27:38 +00:00
Tri Vo
9b61716fe7 Merge "trusty: fuzz: Link to libtrusty dynamically" am: 7280acc996
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1601053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie576818713c7a320424319af90b7b07f4957f75a
2021-02-24 01:17:07 +00:00
Treehugger Robot
0d4089cb1c Merge "Add docs to SystemClock.h" 2021-02-24 00:03:15 +00:00
Chih-hung Hsieh
06e1b6c3cc Merge "Add include directory to -header-filter" 2021-02-23 23:27:43 +00:00
Tri Vo
7280acc996 Merge "trusty: fuzz: Link to libtrusty dynamically" 2021-02-23 20:35:01 +00:00
Zhomart Mukhamejanov
45e0dc1dae Add docs to SystemClock.h
Test: n/a
Change-Id: I16a41e9b98c88270857fe2a1d6b382bfe469bca6
2021-02-23 12:14:57 -08:00
Tri Vo
cb89889af3 trusty: fuzz: Link to libtrusty dynamically
libtrusty can be depended on by multiple thing in a fuzzer's
dependencies tree. It's no longer convenient to link to statically.

Leave tests statically linked. Test infra doesn't seem to handle shared
test libs correctly.

Bug: 171750250
Test: trusty_test_fuzzer libtrusty_coverage_test
Change-Id: Ic7d003151e43fb5bab63354fd42ea9667332743f
2021-02-23 10:23:37 -08:00
Devin Moore
a4ef15bebb Support bootconfig in first stage init and fs_mgr
Androidboot parameters are being moved from the kernel commandline to
bootconfig.
fs_mgr looks for these parameters in properties and falls back to
reading directly from /proc/cmdline. So both of these sources are
updated for bootconfig.
The androidboot parameters from /proc/bootconfig
are added as ro.boot properties, and fs_mgr will fall back to searching
/proc/bootconfig if it is too early.

Test: boot cuttlefish with androidboot.fstab_suffix and
androidboot.hardware in bootconfig and not in cmdline.
Test: atest CtsFsMgrTestCases
Bug: 173815685

Change-Id: Iea36a0da94c26e1aa37d97c576725e0ad77cd3ad
2021-02-23 07:42:06 -08:00
Mohammad Islam
7ef36abfe5 Merge "Create apex reserved dir for update_engine" am: 40839a8469
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1583123

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fa4e111be30e8c76491b88b4f859c8687e8eb80
2021-02-23 12:09:25 +00:00
Mohammad Islam
40839a8469 Merge "Create apex reserved dir for update_engine" 2021-02-23 10:26:26 +00:00
TreeHugger Robot
38aa1b393d Merge "Merge ab/7061308 into stage." into stage-aosp-master 2021-02-23 08:45:48 +00:00
Tri Vo
319b7b8db5 Merge "Update OWNERS based on Trusty team membership" am: 3e9dbccde6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595389

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d2fe0f4f227833c8f44fd4dcbbf1d610abc6f2
2021-02-23 08:34:17 +00:00
Tri Vo
3e9dbccde6 Merge "Update OWNERS based on Trusty team membership" 2021-02-23 05:56:19 +00:00
satayev
db712e9fb5 Merge "Export *CLASSPATH variables after apexes are configured." am: 334a93381d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1589513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If536b5244f578228c740b5a1e9f72a637312a166
2021-02-23 05:22:34 +00:00
satayev
334a93381d Merge "Export *CLASSPATH variables after apexes are configured." 2021-02-23 04:05:14 +00:00
Treehugger Robot
15108cd4a6 Merge "Revert^2 "Remove ART APEX from the bootstrap apexes"" am: acc82258cc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1581185

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaa4e39c5fe7632a78a59266ff90ce13a4070e17
2021-02-23 02:06:58 +00:00
Jaegeuk Kim
4f7f40f0c7 Merge "Try to remount mounted points only" am: 33d15ca2ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1593131

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f948cbdae2d83f50a5336b6761db143361e8b29
2021-02-23 02:03:02 +00:00
Julien Desprez
6c2781b41c Merge "Clean up cc_test TEST_MAPPING after default update" am: 2c41c142ed
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597015

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4abb7bc611e8cd07e2000c08d9ebe2a6f3f36376
2021-02-23 02:02:52 +00:00
Greg Kaiser
3050a1151d Merge "trusty: Remove redundant check" am: cd101cd769
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1598433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8256c92653e2679f4508dcdce0b0670848ecd289
2021-02-23 02:02:34 +00:00
Treehugger Robot
acc82258cc Merge "Revert^2 "Remove ART APEX from the bootstrap apexes"" 2021-02-23 00:47:22 +00:00
Jaegeuk Kim
33d15ca2ce Merge "Try to remount mounted points only" 2021-02-22 23:53:26 +00:00
Tri Vo
eefaf0bb3a Update OWNERS based on Trusty team membership
Change-Id: I2a940f57b3f5da67e12d4f89f9980036d47be321
2021-02-22 14:51:14 -08:00
Julien Desprez
2c41c142ed Merge "Clean up cc_test TEST_MAPPING after default update" 2021-02-22 21:35:36 +00:00
Jaegeuk Kim
5ad7b3cbc5 Try to remount mounted points only
If we don't mount a certain partition intentionally, should be okay to bypass
remounting the partition.

Bug: 180435772
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I7e4d420693f8ba35ec7881d39d0ca682688743c5
2021-02-22 20:46:41 +00:00
Greg Kaiser
cd101cd769 Merge "trusty: Remove redundant check" 2021-02-22 18:38:54 +00:00
satayev
d30a6991bf Merge "Introduce load_exports action." am: 7f9fabad4f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1589512

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I126b8de1cbad23c5d04bbb2b13a43fb80f651902
2021-02-22 17:59:53 +00:00
satayev
7f9fabad4f Merge "Introduce load_exports action." 2021-02-22 17:14:19 +00:00
Lisa (LeeWei) Liu
02d2bcf0f6 Merge "init: ro.boottime.init.modules" am: 74b03a16be
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1574952

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5695129a57f4c1c2675b13d76bfe9e512c64985f
2021-02-22 03:05:03 +00:00
Lisa (LeeWei) Liu
74b03a16be Merge "init: ro.boottime.init.modules" 2021-02-22 01:57:17 +00:00
Greg Kaiser
3e02a60412 trusty: Remove redundant check
This repeats a check in the lines immediately before it.

Test: TreeHugger
Change-Id: I47ac9f359018b87bc283657eddb75ad3d175244e
2021-02-21 10:31:40 -08:00
Xin Li
493484d39e Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I90ee4644f921d6bde03dbaef3f3e86fc080affaa
Change-Id: I0eff7d54656f2b4da44644429a35bdc5ba954fbc
2021-02-21 09:25:21 -08:00
Bob Badour
b2145c414a Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" am: d0bfde2f78
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1591651

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e74137fa3fde5800c36d76b0adab1bd1b52547
2021-02-21 15:48:30 +00:00
Bob Badour
d0bfde2f78 Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/core" 2021-02-21 15:24:32 +00:00
Chih-Hung Hsieh
84006f5ab1 Add include directory to -header-filter
* Only add owned header directories.
* Do not add extra quotes around -header-filter argument,
  or the quotes will be part of the regex and fail to
  match header file paths.

Bug: 179530304
Test: make with WITH_TIDY=1
Change-Id: Icea867cb22264fb2dbbff079a1fc914bf48bbdef
2021-02-19 18:38:06 -08:00
Bob Badour
d69ad69a93 [LSC] Add LOCAL_LICENSE_KINDS to system/core
Added SPDX-license-identifier-Apache-2.0 to:
  bootstat/Android.bp
  cli-test/Android.bp
  code_coverage/Android.bp
  cpio/Android.bp
  debuggerd/crasher/Android.bp
  debuggerd/proto/Android.bp
  diagnose_usb/Android.bp
  fs_mgr/libdm/Android.bp
  fs_mgr/libfiemap/Android.bp
  fs_mgr/liblp/Android.bp
  fs_mgr/libsnapshot/Android.bp
  fs_mgr/libstorage_literals/Android.bp
  fs_mgr/libvbmeta/Android.bp
  fs_mgr/tests/Android.bp
  fs_mgr/tools/Android.bp
  gatekeeperd/Android.bp
  healthd/Android.bp
  healthd/testdata/Android.bp
  init/Android.bp
  init/Android.mk
  init/sysprop/Android.bp
  init/test_kill_services/Android.bp
  init/test_service/Android.bp
  libappfuse/Android.bp
  libasyncio/Android.bp
  libbinderwrapper/Android.bp
  libcrypto_utils/Android.bp
  libcrypto_utils/tests/Android.bp
  libdiskconfig/Android.bp
  libgrallocusage/Android.bp
  libkeyutils/mini_keyctl/Android.bp
  libmodprobe/Android.bp
  libnetutils/Android.bp
  libpackagelistparser/Android.bp
  libprocessgroup/Android.bp
  libprocessgroup/cgrouprc/Android.bp
  libprocessgroup/cgrouprc_format/Android.bp
  libprocessgroup/profiles/Android.bp
  libprocessgroup/setup/Android.bp
  libqtaguid/Android.bp
  libsparse/Android.bp
  libstats/push_compat/Android.bp
  libsuspend/Android.bp
  libsync/Android.bp
  libsystem/Android.bp
  libsysutils/Android.bp
  libusbhost/Android.bp
  libutils/Android.bp
  libvndksupport/Android.bp
  libvndksupport/tests/Android.bp
  llkd/Android.bp
  llkd/tests/Android.bp
  property_service/libpropertyinfoparser/Android.bp
  property_service/libpropertyinfoserializer/Android.bp
  property_service/property_info_checker/Android.bp
  qemu_pipe/Android.bp
  reboot/Android.bp
  rootdir/Android.bp
  rootdir/Android.mk
  rootdir/avb/Android.bp
  rootdir/avb/Android.mk
  run-as/Android.bp
  sdcard/Android.bp
  set-verity-state/Android.bp
  shell_and_utilities/Android.bp
  storaged/Android.bp
  toolbox/Android.bp
  trusty/apploader/Android.bp
  trusty/confirmationui/Android.bp
  trusty/confirmationui/fuzz/Android.bp
  trusty/coverage/Android.bp
  trusty/fuzz/Android.bp
  trusty/fuzz/test/Android.bp
  trusty/gatekeeper/Android.bp
  trusty/gatekeeper/fuzz/Android.bp
  trusty/keymaster/Android.bp
  trusty/keymaster/fuzz/Android.bp
  trusty/libtrusty/Android.bp
  trusty/libtrusty/tipc-test/Android.bp
  trusty/secure_dpu/Android.bp
  trusty/storage/interface/Android.bp
  trusty/storage/lib/Android.bp
  trusty/storage/proxy/Android.bp
  trusty/storage/tests/Android.bp
  trusty/utils/spiproxyd/Android.bp
  trusty/utils/trusty-ut-ctrl/Android.bp
  usbd/Android.bp
  watchdogd/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  debuggerd/Android.bp
  fastboot/Android.bp
  libkeyutils/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-MIT
to:
  libcutils/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT
to:
  fs_mgr/Android.bp
  fs_mgr/libfs_avb/Android.bp
  trusty/Android.bp
  trusty/utils/rpmb_dev/Android.bp

Added SPDX-license-identifier-BSD
to:
  fastboot/fuzzy_fastboot/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id740a7d2884556081fdb68876584b25eb95e1bef
2021-02-19 12:59:05 -08:00
Julien Desprez
c1f8bf6094 Clean up cc_test TEST_MAPPING after default update
After b/179092189, cc_test host_supported:true doesn't need TEST_MAPPING config anymore to
run in presubmit.

Change-Id: I4985b9f1bc0d8bef24df447720d138b1a5072c9c
Test: presubmit
Bug: 178646865
2021-02-19 20:07:05 +00:00
Christopher Ferris
c5b658077b Merge "Update for new kernel 5.11 headers." am: d57652f15b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25c6439f7b0965700289193c0f34ce308ab6b4a8
2021-02-19 19:51:45 +00:00
Christopher Ferris
d57652f15b Merge "Update for new kernel 5.11 headers." 2021-02-19 19:47:44 +00:00
Christopher Ferris
d5076451dd Merge "Don't hard-code number of tombstones." am: a4807cba22
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1592919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id576656c9bc9c3434b9feca7320e04fc2d500b13
2021-02-19 18:19:19 +00:00
Christopher Ferris
a4807cba22 Merge "Don't hard-code number of tombstones." 2021-02-19 17:46:54 +00:00
Artur Satayev
c19f99781b Export *CLASSPATH variables after apexes are configured.
For now, export the exact same values, on `post-fs-data` instead of on
`early-init` to soak the change. As a follow up, the actual values will
be generated by a new oneshot service.

See go/updatable-classpath for more details.

Bug: 180105615
Test: manual - device boots
Change-Id: I5f6826a0f87a5e01233e876d820e581feb555bca
2021-02-19 17:12:26 +00:00
Artur Satayev
500946b637 Introduce load_exports action.
The action reads a file with individual `export` actions declared on
each line, and calls `setenv` for each.

See go/updatable-classpath for details on how this is going to be used.

Bug: 180105615
Test: manual
Change-Id: I5390e52cf8ffd9c3babf31ed854eeecc727351eb
2021-02-19 17:12:26 +00:00
Martijn Coenen
f14403b878 Merge "Add on-device signing binary." am: 73dea057c2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7088dc524fcc2265540dbd66f48720f8e363c0e4
2021-02-19 12:04:16 +00:00
Martijn Coenen
73dea057c2 Merge "Add on-device signing binary." 2021-02-19 11:31:50 +00:00
Lisa Liu
08c862fa00 init: ro.boottime.init.modules
Add a property ro.boottime.init.modules to provide kernel modules
loading time in milliseconds. Also add corresponding log to show in init
log along with loaded module count.

Test: boot test
Bug: 178143513
Change-Id: I77e3939c2a271da6841350a8c2a34ad32f637377
2021-02-19 15:59:04 +08:00
Josh Gao
844ce55770 Merge "Generate text tombstones from proto tombstones by default." am: 8c164946d8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1595302

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I572db2cc334e996c9730bc2563367f35205ea02c
2021-02-19 04:20:27 +00:00
Josh Gao
8c164946d8 Merge "Generate text tombstones from proto tombstones by default." 2021-02-19 03:34:27 +00:00