Commit graph

53317 commits

Author SHA1 Message Date
Tom Cherry
51d8b8bf9d Merge changes from topic "boringssl-kmsg"
am: 993d07fc53

Change-Id: I42f2122241c4f15b751a76e5989a5ffe57791920
2019-09-25 13:21:11 -07:00
Tom Cherry
993d07fc53 Merge changes from topic "boringssl-kmsg"
* changes:
  Redirect boringssl_self_test stdio to kmsg
  init: add stdio_to_kmsg option
2019-09-25 19:56:03 +00:00
Chin-Ting Kuo
8665bb749f Merge "Allow --disable-verification when top-level vbmeta is in 'boot'"
am: e7180a796c

Change-Id: I084dc179167d82f4b1733d2a9b75c5c583f0f62d
2019-09-25 09:12:45 -07:00
Treehugger Robot
e7180a796c Merge "Allow --disable-verification when top-level vbmeta is in 'boot'" 2019-09-25 15:50:05 +00:00
nelsonli
d3de648711 Merge "[vts-core] Add vts_core_liblp_test to vts-core"
am: b4a65cf1ec

Change-Id: Ia0c31149a81a0514ae4b3e612288fb0a71cfe33c
2019-09-24 23:01:10 -07:00
Treehugger Robot
b4a65cf1ec Merge "[vts-core] Add vts_core_liblp_test to vts-core" 2019-09-25 05:54:31 +00:00
nelsonli
055273681c Merge "[vts-core] add copy rules for *-gsi.avbpubkey"
am: 92a9fbeeb6

Change-Id: I7b38b53a336ab4ae1a56e714ee81ab5a9bfbb281
2019-09-24 22:19:01 -07:00
Treehugger Robot
92a9fbeeb6 Merge "[vts-core] add copy rules for *-gsi.avbpubkey" 2019-09-25 04:54:48 +00:00
nelsonli
2daae9f8bb Merge "[vts-core] Add libdm_test in vts-core"
am: 5781a185e1

Change-Id: I0011c8e95dd24648bcf546f2631b80b4dbb1f4d3
2019-09-24 20:28:13 -07:00
Treehugger Robot
5781a185e1 Merge "[vts-core] Add libdm_test in vts-core" 2019-09-25 03:00:50 +00:00
Ashwini Oruganti
a9eac60c74 Merge "Update auditParse to not prepend "b/" to bug IDs"
am: 069eae2efa

Change-Id: Ia48680c0175938b3982c2ae16d3264715f63e1a8
2019-09-24 15:24:19 -07:00
Treehugger Robot
069eae2efa Merge "Update auditParse to not prepend "b/" to bug IDs" 2019-09-24 21:50:58 +00:00
Yifan Hong
bd859add84 Merge "snapshotctl: merge when boot"
am: 8c055fbe3e

Change-Id: I104e7185dc940a432c63d974e011783bb100242c
2019-09-24 13:31:13 -07:00
Treehugger Robot
8c055fbe3e Merge "snapshotctl: merge when boot" 2019-09-24 20:13:52 +00:00
Tom Cherry
f5e872e9e9 Redirect boringssl_self_test stdio to kmsg
To aid in debugging if there are failures.

Bug: 137267623
Test: add prints to boringssl_self_test and see them
Test: add failure prints to the linker and see them before
      boringssl_self_test runs
Change-Id: I89d50c6a46df994d6ea1fadf00e3a8a796043234
2019-09-24 12:47:14 -07:00
Tom Cherry
f74b7f5756 init: add stdio_to_kmsg option
Some services are not native android services and therefore don't log
via the normal mechanisms.  This gives developers an option to have
their stdout/stderr logs sent directly to kmsg.

Test: see test prints to kernel log
Change-Id: I7973ea74d5cab3a90c2cd9a3d5de2266439d0c01
2019-09-24 12:47:14 -07:00
Dan Shi
6d5176a650 Merge "Add require_root to adbd_test and libpackagelistparser_test"
am: 03ba5b9dfb

Change-Id: I047f8c6a700f76219abbfcdc69ff2ab54f5107a3
2019-09-24 11:54:39 -07:00
Dan Shi
03ba5b9dfb Merge "Add require_root to adbd_test and libpackagelistparser_test" 2019-09-24 18:30:44 +00:00
Yifan Hong
57ee82cd7b Merge "libsnapshot: add snapshotctl"
am: 71667636fb

Change-Id: I6ec86ead67e7d7de9a905a6001eae78199987013
2019-09-24 11:22:05 -07:00
Yifan Hong
71667636fb Merge "libsnapshot: add snapshotctl" 2019-09-24 18:06:53 +00:00
Tom Cherry
b58028357f Merge "Uevent: remove useless dir"
am: 4356442029

Change-Id: Ieee876d987f637f47cb25b433bed40b100837b9d
2019-09-24 10:58:32 -07:00
Martin Stjernholm
c82fce8c44 Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change."
am: 0560d0ef6f

Change-Id: I867e33382515b0ba2f10688d352d2057d46fabb6
2019-09-24 10:53:00 -07:00
Tom Cherry
4356442029 Merge "Uevent: remove useless dir" 2019-09-24 17:42:09 +00:00
Martin Stjernholm
0560d0ef6f Merge "Rename ANDROID_RUNTIME_ROOT to ANDROID_ART_ROOT following APEX module name change." 2019-09-24 17:40:04 +00:00
Dan Shi
d1360f4412 Add require_root to adbd_test and libpackagelistparser_test
Bug: 141272654
Test: atest
Change-Id: I14e0d3283cba79a2a4e36e1a1274d6921be5b629
2019-09-24 09:13:32 -07:00
Przemyslaw Szczepaniak
8b66bfc203 Merge "Add libneuralnetworks_packageinfo to neuralnetworks apex dependencies."
am: 5cdf2ef310

Change-Id: I0b2324d857a3668229c2ebbcf83fd4afc0d89070
2019-09-24 08:24:49 -07:00
Przemyslaw Szczepaniak
5cdf2ef310 Merge "Add libneuralnetworks_packageinfo to neuralnetworks apex dependencies." 2019-09-24 15:08:09 +00:00
lijiazi
513c989908 Uevent: remove useless dir
There are no uevent fils in these dirs, so there's no need to
traverse these dirs.

Test: manual

Change-Id: I57b82846ad863952d8717e6c3ab80c1e243ee4f8
Signed-off-by: lijiazi <lijiazi@xiaomi.com>
2019-09-24 17:36:45 +08:00
Chin-Ting Kuo
df6a780ee7 Allow --disable-verification when top-level vbmeta is in 'boot'
If top-level vbmeta struct is in 'boot' partition,
the "flags" element offset of top-level vbmeta header
from the beginning of boot partition is 123 plus
top-level vbmeta offset recorded in the boot image footer.

Bug: 139639521
Test: m fastboot
Test: fastboot --disable-verification flashall
Test: fastboot --disable-verification flash boot boot.img, checks the
      flag isn't changed if the device has vbmeta partition
Test: fastboot --disable-verification flash vbmeta vbmeta.img
Change-Id: Ibf73c9330639e971ee3873ac19f072cf7baed55b
2019-09-24 12:35:26 +08:00
nelsonli
5642e23949 [vts-core] Add libdm_test in vts-core
Add libdm_test to vts-core suite and skip the test if the
first-api-level < 29.

Bug: 132702215
Test: atest vts_libdm_test
Change-Id: Ic805a4c08e5bf9f6c69019d4ea01825ae888e1fe
2019-09-24 11:34:59 +08:00
Yifan Hong
8a679e673f snapshotctl: merge when boot
Test: reboot after OTA on virtual A/B device, see merge
Bug: 135752105

Change-Id: I92eb8d0961635008366c336ead40e3038173257f
2019-09-23 18:50:12 -07:00
Yifan Hong
2feb47a29b libsnapshot: add snapshotctl
... which handles merge when boot completed. It also
dumps debug information when requested.

Bug: 135752105
Test: adb shell su 0 snapshotctl dump
Test: call snapshotctl merge at different stage of OTA:
  - before OTA (exit normally)
  - during OTA is applied (exit with error)
  - after OTA is applied but before reboot (exit with error)
  - after reboot (finish merge and exit normally)
  - Manually stop its execution during merge and run again
      (finish merge and exit normally)

Change-Id: Idcc6aea8d7bbeb9a1a288c966b8f5e14b3f6a3e7
2019-09-23 18:50:12 -07:00
Inseob Kim
2f32fb43cf Merge "Remove vendor_availble of propertyinfoserializer"
am: f08e28e440

Change-Id: Idad626b746e509cffad76431644a7388a8022fa5
2019-09-23 15:45:36 -07:00
Treehugger Robot
f08e28e440 Merge "Remove vendor_availble of propertyinfoserializer" 2019-09-23 22:25:29 +00:00
Ashwini Oruganti
1d02c2addc Update auditParse to not prepend "b/" to bug IDs
Instead, the bug_map entries will now include the b/ prefix. This will
allow arbitrary URLs to be added as well to SELinux denial messages

Bug: 141014771
Test: Generated a denial, verified that the bug id in the dmesg logs
remains unchanged.

Change-Id: I4679117abdc2e13af81336b0b7fd8d69def80147
2019-09-23 14:26:34 -07:00
Steven Moreland
85dfd085e1 Merge "libutils: Trace.h for everything but windows"
am: 30a3b92c0e

Change-Id: I0f9f4a4576d50fdf053eb446d5aae749d4ecd20d
2019-09-23 09:29:28 -07:00
Zimuzo Ezeozue
92241d52ec Merge "Prepare pass_through mounts"
am: fc48a62d4c

Change-Id: I88ef97b82e60164027c1dbc93cdebfe1cbea35c3
2019-09-23 09:24:57 -07:00
Steven Moreland
30a3b92c0e Merge "libutils: Trace.h for everything but windows" 2019-09-23 16:23:06 +00:00
Zimuzo Ezeozue
fc48a62d4c Merge "Prepare pass_through mounts" 2019-09-23 16:02:19 +00:00
Christopher Ferris
8eb2316403 Merge "Increase timeouts."
am: 9cb8e435eb

Change-Id: I8bd9c12093d9db1529ba1c1efdc8e7204661b961
2019-09-23 08:44:56 -07:00
Christopher Ferris
9cb8e435eb Merge "Increase timeouts." 2019-09-23 15:21:15 +00:00
Zim
fc64dad122 Prepare pass_through mounts
Execute mkdir -p /mnt/pass_through/0/emulated
and bootstrap the emulated volume for user 0.

The 'pass_through' paths allow us bind mount the lower
filesystem directly into /storage, bypassing any sdcardfs
of FUSE mounts.

This change is part of enabling upcoming platform changes that are
described in the bug linked below.

Bug: 135341433
Test: builds, boots and pass through directories are created
Change-Id: I46ce207d06a1ec550b8bacac259387371fc0b841
2019-09-23 14:21:27 +01:00
nelsonli
8abba2607b [vts-core] add copy rules for *-gsi.avbpubkey
For using Gtest to run vts_security_avb_test and test it in the
vts-core, we have to add this rule to copy the *-gsi.avbpubkey to the
testcase folder.

Bug: 132702215
Test: 1. add data: "q-gsi.avbpubkey" to Android.bp of the module
      2. m module_name

Change-Id: I810231f39c970da4d2b8ab63daeee02379c7f952
2019-09-23 16:23:50 +08:00
Inseob Kim
3e2899f4cc Merge "Remove static vndk dep from vendor modules"
am: cb2598e485

Change-Id: I83d753b13ae5cf271f69603da88a5a325359becf
2019-09-23 00:24:41 -07:00
Inseob Kim
fa2ba387b9 Remove vendor_availble of propertyinfoserializer
Bug: N/A
Test: m
Change-Id: I68a2bb323ac7cdc0abf3047e96ee02df010ff3c1
2019-09-23 16:13:45 +09:00
Treehugger Robot
cb2598e485 Merge "Remove static vndk dep from vendor modules" 2019-09-23 07:04:15 +00:00
Howard Chen
5787ae1c8c Merge "Mount multiple DSU partitions when present."
am: e6d71689bb

Change-Id: I7cee222525313ac2dae0198d7bd3f2cd01ff5553
2019-09-20 20:01:42 -07:00
Howard Chen
e6d71689bb Merge "Mount multiple DSU partitions when present." 2019-09-21 02:48:37 +00:00
Christopher Ferris
11555f0961 Increase timeouts.
There is still some flakiness, so increase the timeout values.
Also remove the TEMP_FAILURE_RETRY macro usage in TIMEOUT calls.
That macro disables the ability of the alarm code to interrupt
the system call.

Bug: 141045754

Test: Unit tests pass.
Change-Id: Ia3c95dccc3076a3fd5ef6432097a57e4ccee4df3
2019-09-20 15:07:03 -07:00
Yifan Hong
f471637e19 Merge changes from topic "libsnapshot_api_update_engine"
am: e71efc3dc4

Change-Id: I862e2f1038c2481141d27b93ecab6bb11050fbf4
2019-09-20 14:25:13 -07:00