Commit Graph

52434 Commits

Author SHA1 Message Date
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 7f114540d8 Merge "Fix typo"
am: dec467f271

Change-Id: Iccd201c8ae3f4ff9fce50d03035acfd789ea302a
2019-08-31 08:07:40 -07:00
Treehugger Robot dec467f271 Merge "Fix typo" 2019-08-31 13:39:37 +00:00
Christopher Ferris 7138232f57 Add test of undefined return address.
Add a specific test that __libc_init is the last frame in a stack
when run on device. In addition, it verifies that the return address
register is marked as undefined given the unwind.

Bug: 140008396

Test: New unit test passes on arm/arm64 (taimen device).
Test: New unit test passes on x86 (cuttlefish).
Test: New unit test passes on x86_64 (modified bionic/tests/run-on-host.sh)
Change-Id: Iefc151a7dbf52ab083c2bb78bad3d38b4e9e1254
2019-08-30 23:29:34 -07:00
Kevin Han b669307517 Merge "Revert "Reland "libutils: Introduce StaticString16""""
am: c9cddde018

Change-Id: Idd00ff6dc4adc775fdaa59e2c3942b15db92ad98
2019-08-30 21:14:43 -07:00
Treehugger Robot c9cddde018 Merge "Revert "Reland "libutils: Introduce StaticString16"""" 2019-08-31 04:00:15 +00:00
Kevin Han 1270e4fbf1 Revert "Reland "libutils: Introduce StaticString16"""
This reverts commit c55ac92bd6.

Reason for revert: Breaks down-stream branches. See b/140315617

Change-Id: I4937fdf4bdcc7a44d5f10700ecf2d5e96aef7d27
Merged-In: I8da93f2c9b95183e32d4a2ea895f90c449abbe4d
2019-08-30 23:50:38 +00:00
Tom Cherry 905a5df83d init: Always reap processes before handling properties
There is a race that manifests like this:

1) A service dies (not processed by init yet).
2) service_manager processes death notification.
3) service_manager gets checkService and calls init to start service.
4) init gets the ctl.start / ctl.interface_start for the service
   but the service already appears started, so it does nothing.
5) init gets sigchld, but doesn't do anything else to restart the
   service

We can avoid all of this if we already reap pending processes before
handling properties in the main loop of init.  Since reaping the
services calls waitid(), there's no race even if the signalfd for
sigchld hasn't triggered yet.  It also won't cost us much efficiency,
since it's only a single system call.

Test: CF boots, init unit tests pass
Change-Id: Ie24ef406055b283797b41b1821c8ebcccead4db4
2019-08-30 14:20:05 -07:00
Vic Yang 584af3282c Merge "Reland "libutils: Introduce StaticString16"""
am: d3fa47bb05

Change-Id: I963f2a59c7a7ad149be54b8bb7322ad1abf3e935
2019-08-30 14:07:14 -07:00
Treehugger Robot d3fa47bb05 Merge "Reland "libutils: Introduce StaticString16""" 2019-08-30 20:42:14 +00:00
Paul Lawrence b2c2d6907f Fix typo
Test: builds
Change-Id: I4b48e8b3d457382579216482249e734f74768c71
2019-08-30 11:15:58 -07:00
Vic Yang c55ac92bd6 Reland "libutils: Introduce StaticString16""
This time with old branches excluded.

Bug: 138856262
Test: Run unit tests.
Change-Id: Id0bb1d54b71e38244d64f1b684db1fda81de854c
Merged-In: I8da93f2c9b95183e32d4a2ea895f90c449abbe4d
2019-08-30 11:01:27 -07:00
Martin Stjernholm cacf04351f Update logic for detecting pre-apexd services to check that the ART APEX is
mounted.

Necessary to make e.g. bootanimation work, which depends on (at least)
libandroidicu.so in the ART APEX.

Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Ibab4f5f7a243d0815b9c70a537bae8d77dee2fbb
Merged-In: Ibab4f5f7a243d0815b9c70a537bae8d77dee2fbb
2019-08-30 17:47:31 +01:00
Martin Stjernholm df96e1f25c Update paths and names for the new ART APEX.
Test: Build & boot
Test: atest CtsJniTestCases
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: Ic59b7bc8aae7ce521cf3ec9df4ab72aa611d0b75
Merged-In: Ic59b7bc8aae7ce521cf3ec9df4ab72aa611d0b75
2019-08-30 17:47:31 +01:00
Martin Stjernholm 391332d276 Include com.android.runtime in the "runtime" linker namespace.
This is a temporary fix to keep the Bionic-associated libraries accessible
in the runtime namespace, pending a proper namespace split.

Test: Build & boot with taimen_hwasan-userdebug
Bug: 139408016
Bug: 139916951
Exempt-From-Owner-Approval: Approved internally
Change-Id: I27069b20f7c7068b931340f548b284ce1676466c
Merged-In: I27069b20f7c7068b931340f548b284ce1676466c
2019-08-30 17:47:31 +01:00
Yifan Hong 5d0acc7516 Merge "libsnapshot: GetSnapshotExtraDeviceName"
am: cc746b5193

Change-Id: Ida92e3f8bf1e0c00116a8344109e4d6c923661fd
2019-08-29 17:09:11 -07:00
Yifan Hong 949a13795f Merge "liblp: convert more functions to use string_view (#3)"
am: 2fa089be00

Change-Id: I12775453eff74913550cc5917ca7cec6d245f95d
2019-08-29 16:53:48 -07:00
Treehugger Robot cc746b5193 Merge "libsnapshot: GetSnapshotExtraDeviceName" 2019-08-29 23:48:18 +00:00
Treehugger Robot 2fa089be00 Merge "liblp: convert more functions to use string_view (#3)" 2019-08-29 23:31:48 +00:00
Vic Yang 2d26a252c4 Merge "Revert "libutils: Introduce StaticString16""
am: d0e02d58d9

Change-Id: I6cb3893898d4739de54f7d67bb07c3f0c6ef6471
2019-08-29 16:09:33 -07:00
Vic Yang d0e02d58d9 Merge "Revert "libutils: Introduce StaticString16"" 2019-08-29 22:52:41 +00:00
Vic Yang 86eaa8de78 Revert "libutils: Introduce StaticString16"
This reverts commit d4cb489434.

Reason for revert: Breaking aosp_bonito-userdebug

Change-Id: Iea72f39d40f476002ce0ad6b5ce3b4e1ca570de7
2019-08-29 22:47:07 +00:00
Mark Salyzyn 1f020a03a8 Merge "fs_mgr: overlayfs: test: noatime on rw mounts only"
am: 7f17baa158

Change-Id: I46d29c9896377045e1cdbf99ace5f045f7faf65f
2019-08-29 14:56:22 -07:00
Yifan Hong 65db930d5a libsnapshot: Record COW size(s) in snapshot status file
The COW device consist of two parts: empty space in
super and the loop device. Record it in the snapshot
status file so that MapSnapshot can determine which
devices needs to be mapped.

Test: builds
Change-Id: I08fb051c080802842d2f5b43c2adeed4f04b7c5f
2019-08-29 14:53:50 -07:00
Yifan Hong 9fca50f356 libsnapshot: GetSnapshotExtraDeviceName
Return the name with -inner suffix.

Test: builds
Test: libsnashot_test
Change-Id: Idd66d0c3f1a625af3d73b7a8bdff32b69e501737
2019-08-29 14:49:11 -07:00
Yifan Hong c205f585e7 liblp: convert more functions to use string_view (#3)
Test: builds

Change-Id: Ia448993ff61d46ae2280e3d3c02b5e84dd51f37c
2019-08-29 14:48:40 -07:00
Mark Salyzyn 7f17baa158 Merge "fs_mgr: overlayfs: test: noatime on rw mounts only" 2019-08-29 21:40:46 +00:00
Mark Salyzyn 6f07a8af11 fs_mgr: overlayfs: test: noatime on rw mounts only
Regression from commit 808763e825
("fs_mgr: overlayfs: noatime").  Test fails on some targets
that do not follow our advise to mount noatime for all partitions.
blueline mounts the system partitions relatime.  In the grand
scheme this is not a problem because we never remount these
partitions read-write because of the overlayfs integration.

Filter out read-only mounts from those enumerated for noatime,
those failures do not concern us in the context of this test.

This test expected to fail if CtsOsTestCases EnvironmentTest fails.

Test: adb-remount-test.sh
Bug: 140253722
Bug: 140014856
Change-Id: I778e7f539ac3f3d6495867e264767f2af25e11c7
2019-08-29 14:12:39 -07:00
Vic Yang feb658487a Merge "libutils: Introduce StaticString16"
am: b38616bc70

Change-Id: I3b75808acb9bc69b6f7c9c191154e93f61e55722
2019-08-29 14:10:20 -07:00
Vic Yang b38616bc70 Merge "libutils: Introduce StaticString16" 2019-08-29 20:57:16 +00:00
Tom Cherry 7e810bd65f Merge "fastboot: preserve partition_type if wants_wipe=true"
am: 390b48bad2

Change-Id: I5338320ddac7dde9da45c218620a98827052c333
2019-08-29 13:48:50 -07:00
Tom Cherry 390b48bad2 Merge "fastboot: preserve partition_type if wants_wipe=true" 2019-08-29 20:24:52 +00:00
qiwu chen 148062f276 Merge "fastboot: Initialize UploadInner dsize value to 0"
am: b5440039ac

Change-Id: I4693cb601f6d7888181bca0e1c59d4ae35306dce
2019-08-29 11:44:53 -07:00
Treehugger Robot b5440039ac Merge "fastboot: Initialize UploadInner dsize value to 0" 2019-08-29 18:39:31 +00:00
Wei Wang 8e4f7fb137 Merge "Let blkio cgroup follow sched_policy"
am: 2b73b60c66

Change-Id: Iedaab188d00a0df791ec5ea862608971af4321f7
2019-08-29 11:22:44 -07:00
Steven Moreland de6b1d4d2e Merge "init: -1 log for control message error paths."
am: b4eedd9ccd

Change-Id: Ie6b167162db57ab83b82c27000373ecebda17334
2019-08-29 11:15:00 -07:00
Wei Wang 2b73b60c66 Merge "Let blkio cgroup follow sched_policy" 2019-08-29 18:13:02 +00:00
Treehugger Robot b4eedd9ccd Merge "init: -1 log for control message error paths." 2019-08-29 17:53:47 +00:00
Mark Salyzyn 0838a467ef Merge "fs_mgr: overlayfs: noatime"
am: a133690fc4

Change-Id: If6835d9244e0e606fe706cd995fea837d9d0e577
2019-08-29 10:01:17 -07:00
Treehugger Robot a133690fc4 Merge "fs_mgr: overlayfs: noatime" 2019-08-29 16:49:04 +00:00
Jooyung Han 57b4d65eff Merge "ld.config.txt: remove link from rs to vndk"
am: 059b8dacfd

Change-Id: I647b726e70d2c0710b45b15f1bad08ebe2524b19
2019-08-29 09:40:42 -07:00
Treehugger Robot 059b8dacfd Merge "ld.config.txt: remove link from rs to vndk" 2019-08-29 16:18:27 +00:00
Steven Moreland 9800ad839a init: -1 log for control message error paths.
Fixes: 140136969
Test: check logs
Change-Id: Id80f59927b44d1026c6e3389c80ca96baf0733c4
2019-08-29 16:08:36 +00:00
Tom Cherry 21fd368dc2 Merge "Start serial console at the 'init' trigger"
am: c70fc1cbfd

Change-Id: I18b1fc5fb667d4938e9d2a8fb9098444ef53259b
2019-08-29 09:07:37 -07:00
Tom Cherry c70fc1cbfd Merge "Start serial console at the 'init' trigger" 2019-08-29 15:53:46 +00:00
qiwu chen 325ba6ffa8 fastboot: Initialize UploadInner dsize value to 0
We must initialize UploadInner dsize value to 0, in case
stuck in ReadBuffer when receive DATA packet which dsize
is 0 or non DATA type packet. This will lead to fastboot
hang up unless USB unplugged.

Change-Id: I1e9752585c3d1013b1b1da38ead9ba4c532c2d34
Signed-off-by: qiwu chen <qiwuchen55@gmail.com>
2019-08-29 14:56:19 +08:00
cfig f60613b4e8
fastboot: preserve partition_type if wants_wipe=true
originally if wants_wipe=true, program will erase and format partitions,
but after fb->Erase(), partition type should be raw(all 0xFFs),
then following fb_perform_format() will miss its original partition_type
Now we call fb_perform_format() with original fs type to keep the
partition consistent after wiping.

Change-Id: Ic778850588d5dd6fee23169d20c26bcbaa510627
2019-08-29 13:19:29 +08:00