Commit graph

52584 commits

Author SHA1 Message Date
Tom Cherry
96ccbfb720 Merge "liblog: run liblog#enoent only as root" am: 8412deda51
am: 4375597f95

Change-Id: I57b578be7053e69b9538f4788a04f7b7ced0a317
2019-09-04 19:38:12 -07:00
Tom Cherry
4375597f95 Merge "liblog: run liblog#enoent only as root"
am: 8412deda51

Change-Id: I5b179babe5324bcd63a5303f65a72e9e4bb6e9c2
2019-09-04 19:30:02 -07:00
Treehugger Robot
8412deda51 Merge "liblog: run liblog#enoent only as root" 2019-09-05 02:04:33 +00:00
Daniel Colascione
7f2d3393d1 Merge "Improve codegen slightly when doing FD validity checks" am: 9ad079ba58
am: 2378575dac

Change-Id: I6aeb111fd45b9cd1936f032a67e2b8739aa37cd8
2019-09-04 18:27:24 -07:00
Daniel Colascione
2378575dac Merge "Improve codegen slightly when doing FD validity checks"
am: 9ad079ba58

Change-Id: I4262f086b9041bb28536cf2c7598817fac63b8cc
2019-09-04 18:20:24 -07:00
Daniel Colascione
9ad079ba58 Merge "Improve codegen slightly when doing FD validity checks" 2019-09-05 00:56:38 +00:00
Yifan Hong
ed32bf163b Merge "libsnapshot: Refactor CreateLogicalAndSnapshotPartitions" am: dccd6b3389
am: 362853af1a

Change-Id: I5c667679545459aaa21c6163487881fd11900148
2019-09-04 15:26:39 -07:00
Yifan Hong
de969e9553 Merge "liblp: Indicate usable regions in ResizePartition" am: d6c426c0f5
am: fb0386f76c

Change-Id: I27655100febdf3cf56189691e5394e0cc54b7258
2019-09-04 15:25:53 -07:00
Yifan Hong
362853af1a Merge "libsnapshot: Refactor CreateLogicalAndSnapshotPartitions"
am: dccd6b3389

Change-Id: I6222327558d2fc9f0bad1056ef4d53e4e8a5fa48
2019-09-04 15:11:48 -07:00
Yifan Hong
fb0386f76c Merge "liblp: Indicate usable regions in ResizePartition"
am: d6c426c0f5

Change-Id: Ia555bc10e05cd60fec50f7974581ff9a1269c67d
2019-09-04 15:10:54 -07:00
Yifan Hong
dccd6b3389 Merge "libsnapshot: Refactor CreateLogicalAndSnapshotPartitions" 2019-09-04 21:55:39 +00:00
Yifan Hong
d6c426c0f5 Merge "liblp: Indicate usable regions in ResizePartition" 2019-09-04 21:53:57 +00:00
Alessio Balsini
1af47f836c Merge "CreateSnapshot: reduce zero-filling for CoW images" am: 2dc25441e2
am: ab92aeb61b

Change-Id: I218fd34afbc2f5a3377b78706eba7c465b3033a6
2019-09-04 14:37:52 -07:00
Christopher Ferris
df52cbc15f Merge "Add test mapping to run the libunwind tests." am: c3163e7664
am: f0edee5933

Change-Id: I37ce9b12f816b865bc4d5f5f78655ae3509ea361
2019-09-04 14:37:02 -07:00
Alessio Balsini
ab92aeb61b Merge "CreateSnapshot: reduce zero-filling for CoW images"
am: 2dc25441e2

Change-Id: Ia97c9c1888bcb751de5b2fccde30e036c2618591
2019-09-04 14:35:35 -07:00
Christopher Ferris
f0edee5933 Merge "Add test mapping to run the libunwind tests."
am: c3163e7664

Change-Id: Ib82965bef7d9e9a983cbc7d282fa59abab083ece
2019-09-04 14:21:22 -07:00
Treehugger Robot
2dc25441e2 Merge "CreateSnapshot: reduce zero-filling for CoW images" 2019-09-04 21:19:44 +00:00
Daniel Colascione
7c706baedb Improve codegen slightly when doing FD validity checks
See https://gcc.godbolt.org/z/hGUZIk

Test: inspection
Bug: 140506797
Change-Id: I6fe87b16e18c93b7fc3ca28edbbc68c245e7e5e5
2019-09-04 13:46:50 -07:00
Tom Cherry
0bf41672e9 liblog: run liblog#enoent only as root
Previously this test would rely on ro.debuggable being true, but there
are now some circumstances where ro.debuggable is true, yet `su` does
not exist.  Therefore we only run this test when it is root.

Also simplify some of the test macros.

Bug: 140446213
Test: passes as root, skips as non-root
Change-Id: I0651963d5c7d4f5308989ab6b04aab1042094e5a
2019-09-04 13:39:06 -07:00
Christopher Ferris
c3163e7664 Merge "Add test mapping to run the libunwind tests." 2019-09-04 20:28:37 +00:00
Yifan Hong
8786b58b6d Merge "libsnapshot: Don't accidentally delete snapshot when collapsing" am: 48eb2ee176
am: 44d025d928

Change-Id: I487acdeba0002c2d7403edad751396e8b6fa19c8
2019-09-04 13:14:22 -07:00
Yifan Hong
f42bdac4f3 Merge "libsnapshot: Allow multiple calls to FinishedSnapshotWrites" am: 09a0c98506
am: ab13ed350e

Change-Id: I4a3f4e4c16b5d9a83bb26b1e04bd68f58e42ab96
2019-09-04 13:13:11 -07:00
Yifan Hong
44d025d928 Merge "libsnapshot: Don't accidentally delete snapshot when collapsing"
am: 48eb2ee176

Change-Id: Ibe795625cd858e7cf72dc0a7ac4d08bf2f081d7b
2019-09-04 13:08:13 -07:00
Yifan Hong
ab13ed350e Merge "libsnapshot: Allow multiple calls to FinishedSnapshotWrites"
am: 09a0c98506

Change-Id: If259e2d4a9663575198aa1b14e13a4c9a50cf1e7
2019-09-04 13:05:48 -07:00
Yifan Hong
48eb2ee176 Merge "libsnapshot: Don't accidentally delete snapshot when collapsing" 2019-09-04 18:53:23 +00:00
Yifan Hong
09a0c98506 Merge "libsnapshot: Allow multiple calls to FinishedSnapshotWrites" 2019-09-04 18:52:30 +00:00
Yifan Hong
a93ac6b9c8 libsnapshot: Allow multiple calls to FinishedSnapshotWrites
If update_engine crashes at certain point, it may
call FinishedSnapshotWrites multiple times. Allow
this to happen.

Test: apply OTA
Change-Id: Ib36cfe38328fd5d6ca408c97024c81569a4bd440
2019-09-03 21:07:30 -07:00
Yifan Hong
d65020d05e liblp: Indicate usable regions in ResizePartition
- Open up GetFreeRegions() API.
- Add a new argument, free_region_hint, to ResizePartitions(). It
  indicates the regions that extents can be allocated to.
- Expose Interval::Intersect functions. libsnapshot needs the algorithm
  to intersect extents to find out the free regions for COW partitions.

Test: liblp_test

Change-Id: I0c079c0e919aa7b0627eb76a071a7cc2a281d692
2019-09-03 20:08:28 -07:00
Yifan Hong
31fda7e476 libsnapshot: Refactor CreateLogicalAndSnapshotPartitions
Create SnapshotManager::MapPartitionWithSnapshot that deals
with one partition so that the code can be re-used later.

Test: libsnapshot_test

Change-Id: Iba36e6c05f8541397323361f7ceb62a6472d2e1c
2019-09-03 19:45:22 -07:00
Yifan Hong
27139799ff libsnapshot: Don't accidentally delete snapshot when collapsing
Test: libsnapshot_test
Change-Id: Ie84546f90f7f186bda88f19f7d29ad437ce97aa8
2019-09-03 16:07:31 -07:00
Christopher Ferris
7aba5142e9 Add test mapping to run the libunwind tests.
Created a special target, libunwindstack_unit_test, that doesn't
include the test that dlopen's a shared library. It appears atest
doesn't understand how to handle the require keyword.

Also, move the shared library into the libunwindstack_test directory
itself.

Test: Ran atest libunwindstack_unit_test.
Change-Id: I967919b1d74a08669b61d0363d80861685725609
2019-09-03 13:32:51 -07:00
Yifan Hong
cefab5867f Merge "libsnapshot: Record COW size(s) in snapshot status file" am: a9ffef27e1
am: 6777935a94

Change-Id: If33ede191af8486aad9dfcc3d0a99f3eb6f18d93
2019-09-03 10:04:09 -07:00
Christopher Ferris
3e3533cd82 Merge "Add test of undefined return address." am: 0ac9b9a894
am: 0a0ea79724

Change-Id: I79c8aa51dc0253ad47f361c60d1338b37461baf4
2019-09-03 10:03:38 -07:00
Tom Cherry
45d387e8dc Merge "init: Always reap processes before handling properties" am: 0589aa4265
am: 3f5cc2dd84

Change-Id: I8e9f371bff44ad7fb3f0a809cea041c86168444f
2019-09-03 10:03:08 -07:00
Yifan Hong
6777935a94 Merge "libsnapshot: Record COW size(s) in snapshot status file"
am: a9ffef27e1

Change-Id: Iea27711e0c366a9136b3a1fa4940df5d4eff4e7b
2019-09-03 09:57:39 -07:00
Christopher Ferris
0a0ea79724 Merge "Add test of undefined return address."
am: 0ac9b9a894

Change-Id: I60812c461523eccb8b272fcfd8173542f537d3c2
2019-09-03 09:57:09 -07:00
Tom Cherry
3f5cc2dd84 Merge "init: Always reap processes before handling properties"
am: 0589aa4265

Change-Id: I825598315caa2a6fe592f293815adf8242f0a644
2019-09-03 09:56:38 -07:00
Yifan Hong
a9ffef27e1 Merge "libsnapshot: Record COW size(s) in snapshot status file" 2019-09-03 16:43:49 +00:00
Christopher Ferris
0ac9b9a894 Merge "Add test of undefined return address." 2019-09-03 16:41:02 +00:00
Tom Cherry
0589aa4265 Merge "init: Always reap processes before handling properties" 2019-09-03 16:35:27 +00:00
Alessio Balsini
396a4f279e CreateSnapshot: reduce zero-filling for CoW images
Instead of zero-filling the whole image, only clean the dm-snapshot
metadata header of the CoW file.

Zero-filling a large image may take a long time, and this is a safe, but
not necessary operation if the operation is intended to prepare an
initial CoW file that will be used with a dm-snapshot device.
According to the Linux kernel code, only the first 32 bits of the CoW
file is used to detect if the dm-snapshot device under creation will be
at an initial state or the continuation of a previous dm-snapshot.
CREATE_IMAGE_RESET_SNAP is a flag that reduces the zeroing of the image
file to the first file chunk.

Change-Id: Ibc9fb3b6d19666a92125c988687ff8dacfad47be
Depends-On: I242e57a9a622fbb738bf82f8a260af1b13810069
Bug: 139378014
Test: manual, snapshot_test
Signed-off-by: Alessio Balsini <balsini@google.com>
2019-09-02 11:24:33 +00:00
Martin Stjernholm
eefb793749 Merge changes from topic "art-without-bionic" am: 0c100685dc
am: 9c72fb6f08

Change-Id: Ifa9b83176a6f81c6472d2a931a4771615cd5f229
2019-09-02 04:04:34 -07:00
Martin Stjernholm
477400792f Update logic for detecting pre-apexd services to check that the ART APEX is mounted. am: cacf04351f
am: 4c063099a2

Change-Id: I1bfe1e77b3d9b2ba7efc1482baa1837191771326
2019-09-02 04:04:25 -07:00
Martin Stjernholm
4963265dc7 Update paths and names for the new ART APEX. am: df96e1f25c
am: bb55e0776f

Change-Id: I9484471564b839bbed9ac3d31972743c9f2c57d1
2019-09-02 04:04:18 -07:00
Martin Stjernholm
9c72fb6f08 Merge changes from topic "art-without-bionic"
am: 0c100685dc

Change-Id: I814ac6be70ff8ec197b71d2b68578fba75ac3b4a
2019-09-02 03:46:05 -07:00
Martin Stjernholm
4c063099a2 Update logic for detecting pre-apexd services to check that the ART APEX is mounted.
am: cacf04351f

Change-Id: Ibe7463cf6445bf3fc37a1ae68cb38d4f1e3f1b60
2019-09-02 03:45:53 -07:00
Martin Stjernholm
bb55e0776f Update paths and names for the new ART APEX.
am: df96e1f25c

Change-Id: I971a44846276c7e8432bf27fa9465c86f33a1cd2
2019-09-02 03:45:36 -07:00
Martin Stjernholm
0c100685dc Merge changes from topic "art-without-bionic"
* changes:
  Include com.android.runtime in the "runtime" linker namespace.
  Update logic for detecting pre-apexd services to check that the ART APEX is mounted.
  Update paths and names for the new ART APEX.
2019-09-02 10:28:30 +00:00
Paul Lawrence
4fc8a5c20a Merge "Fix typo" am: dec467f271
am: 7f114540d8

Change-Id: Iaa6bceebdab147a9e332c2db511aac9242474e3a
2019-08-31 08:15:41 -07:00
Paul Lawrence
7f114540d8 Merge "Fix typo"
am: dec467f271

Change-Id: Iccd201c8ae3f4ff9fce50d03035acfd789ea302a
2019-08-31 08:07:40 -07:00