Commit graph

46940 commits

Author SHA1 Message Date
Jiyong Park
fc97d2a116 Revert "Handle adb sync with Bionic under /bionic"
This reverts commit 7c7189c469.

Bug: 125549215
Test: system/core/fs_mgr/tests/adb-remount-test.sh
Change-Id: I4ee40cda9c3b94b116dc822c7b9736cfe2c9c9f0
2019-03-14 07:35:54 +09:00
Jiyong Park
7b4801a921 Don't bind-mount bionic files
Bind-mounting of the bionic files on /bionic/* paths no longer required
as there are direct symlinks from bionic files in /system partition to
the corresponding bionic files in the runtime APEX. e.g.,

/system/lib/libc.so -> /apex/com.android.runtime/lib/bionic/libc.so

Bug: 125549215
Test: m; devices boots
Change-Id: I4a43101c3e3e2e14a81001d6d65a8a4b727df385
2019-03-14 07:35:54 +09:00
Jiyong Park
192fdeb495 /bionic path is gone
The path no longer exists, and thus the path doesn't need to be
unmounted upon remounting.

Bug: 125549215
Test: system/core/fs_mgr/tests/adb-remount-test.sh
Change-Id: I7b263c755ad7eeaa63a00ad9795a134707698625
2019-03-14 07:35:54 +09:00
David Anderson
5df0092353 libfiemap_writer: Fix the progress bar on VFAT partitions.
We allocate VFAT file space by seeking and writing a single byte. It
turns out this is not fast enough to avoid invoking the progress
callback, so instead, we should seek in increments.

Bug: 126230649
Test: fiemap_writer_test gtest
Change-Id: I2b363af4ebde873411e8a3acd22ca68d175afe3f
2019-03-13 13:58:12 -07:00
Hans Boehm
6e75ad6e13 Revert "Revert "Fix wp and sp comparison bugs""
Fix wp and sp comparison bugs

Make clear() actually clear wp m_refs, so that nulls compare equal.

Make equality consistent with < and >, ensuring that a weak pointer
cannot be both equal to and greater than another.

Don't rely on the built-in < and > operators to correctly order
different objects. The standard does not guarantee that, and there is
a risk of compiler relying on that lack of guarantee.

Remove unnecessary comparison overloads, especially those
comparing a wp<> to an sp<>.

Change the remaining wp<> to sp<> comparisons to check for equivalence
of the mRefs pointer instead of the object address, thus eliminating
the dubious equal comparison result for a dead wp<> and an sp<> that
happen to point to the same object address.

Add comparison tests.

This reverts commit a2a2ad8057.

The original code, and my original CL, both failed to initialize m_refs
in various wp<> constructors. This now became more important, since
comparisons now rely more on m_refs. However I believe it was always
a bug, since some comparisons always relied on m_refs.

Test: Treehugger, boot AOSP, atest RefBase
Bug: 126922090
This reverts commit a2a2ad8057.

Reason for revert: Reapply after constructor fixes.

Change-Id: I2c8917416a2306e36d2b6bb7b397f653020e5688
2019-03-13 13:26:35 -07:00
David Anderson
b8e1711980 Revert "liblp: Reclaim wasted space from unaligned partitions."
When this patch landed, it was thought that over-allocating partitions
had no undesired side effects. However there are cases where it is now
causing problems. When flashing a GSI for VTS, the vbmeta is appended to
the end of the partition. If libfs_avb cannot find this vbmeta by
looking at the end of the partition, verification will fail. Similar use
cases with verifying other dynamic partitions are expected to be
problematic, so for now we revert to block-size alignment.

This reverts commit dccfdca1e1.

Bug: 125113249
Test: liblp_test gtest
Change-Id: Ibfd66734b63265e9fbb2ccf6b670c168c36190bc
2019-03-13 12:58:21 -07:00
Christopher Ferris
fb3535ea56 Merge "Fix missing offset for apk."
am: 9a00f596d3

Change-Id: Ie4a9074591aef5869479dc6f872bff8ae1d54dee
2019-03-13 11:31:40 -07:00
Christopher Ferris
9a00f596d3 Merge "Fix missing offset for apk." 2019-03-13 18:16:05 +00:00
Elliott Hughes
964932d7ce run-as: improve diagnostics on failure.
Bug: http://b/128523258
Test: manual
Change-Id: I4430a8d309c0e9b5315aaae3e7d223c05b7ea3e5
2019-03-13 11:16:03 -07:00
Tim Murray
0e5c00f375 lmkd: set PSI_POLL_PERIOD to 40ms
200ms was too lenient when under severe memory pressure.

Test: boots, works
Bug: 127765309

Change-Id: I8e047de6318574a107720c56473ed0f25582e182
Signed-off-by: Tim Murray <timmurray@google.com>
2019-03-13 10:13:19 -07:00
Roland Levillain
3f3e2c678e Remove Valgrind entries from fs_config.
Valgrind has been removed from the Android tree in 2018.

Test: n/a
Bug: 77856586
Change-Id: I3b51d9b2290a4276299725cdd5a53a5bba00166e
2019-03-13 17:12:00 +00:00
Valerie Hau
85178d56a4 Merge "Revert "Fix wp and sp comparison bugs""
am: e61e8c6b62

Change-Id: Id7ee61d98e2354fe346d76b91be5a820c40eaf29
2019-03-13 08:20:13 -07:00
Valerie Hau
e61e8c6b62 Merge "Revert "Fix wp and sp comparison bugs"" 2019-03-13 15:03:04 +00:00
Neil Fuller
8c8d8f5df9 Merge "Add an env variable for the tzdata module root"
am: 822dbd8911

Change-Id: I68b3dc4ee4dc8a5a0a6e8aade1e4490afbf20581
2019-03-13 01:54:55 -07:00
Neil Fuller
822dbd8911 Merge "Add an env variable for the tzdata module root" 2019-03-13 08:49:30 +00:00
Martijn Coenen
5cdb3a9af8 Merge "Create /metadata/apex/[sessions]."
am: 13b5c3bee7

Change-Id: I0a1786a437377c7db2505c792f8a174b23042131
2019-03-13 01:08:59 -07:00
Martijn Coenen
13b5c3bee7 Merge "Create /metadata/apex/[sessions]." 2019-03-13 07:46:32 +00:00
Xin Li
652a53cf9a [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: 35c5cd9139 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b2a4e6c90f014b15658292134e374f2b3802208
2019-03-12 22:23:14 -07:00
The Android Open Source Project
8ba23f2a77 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: 4d916a1ece -s ours
am skip reason: subject contains skip directive

Change-Id: I31a0756b75ab6d657dc26807ce8baeb42c40d232
2019-03-12 21:47:32 -07:00
Jayant Chowdhary
04d5b78403 Merge "Special case init for android_is_in_vendor_process."
am: 3dd9881ca7

Change-Id: I49c4d42398f13737e8ddc6c0c04ad685e561b463
2019-03-12 21:45:59 -07:00
Hans Boehm
a2a2ad8057 Revert "Fix wp and sp comparison bugs"
This reverts commit 029b12ebde.

Reason for revert: There appear to be problems with null comparisons. Reported failure in HwcBufferCacheTest.

Change-Id: I19745bb281dabe8b05c2df3fe95e7be7a49dcd51
2019-03-13 03:24:12 +00:00
Xin Li
35c5cd9139 Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 2019-03-13 02:26:03 +00:00
Jayant Chowdhary
3dd9881ca7 Merge "Special case init for android_is_in_vendor_process." 2019-03-13 00:07:05 +00:00
Christopher Ferris
86f2d9d943 Fix missing offset for apk.
The elf_start_offset field in a map_info was not set in one path.

Added new offline test for this, and update a few unit tests.

Bug: 128442792

Test: New unit tests pass.
Change-Id: I2c6ac1b5271a99aa0e8c4b6342a5970199185112
2019-03-12 16:00:55 -07:00
Jooyung Han
037f039cd0 Merge "Revert "Mark libs as double_loadable""
am: 1922a501bf

Change-Id: I9c5a3d811cbdb45a3d6bc7c4524e3d20a6959191
2019-03-12 15:25:15 -07:00
Treehugger Robot
1922a501bf Merge "Revert "Mark libs as double_loadable"" 2019-03-12 22:11:27 +00:00
Martijn Coenen
4517e57ff5 Create /metadata/apex/[sessions].
For storing persistent apex session state.

Bug: 126740531
Test: builds
Change-Id: Ibf280764977768956b5512b2252d22ceaba31c1e
2019-03-12 22:05:20 +01:00
Hans Boehm
1deb957b15 Merge "Fix wp and sp comparison bugs"
am: 28fdb8e282

Change-Id: If5eae1a7d63c284dc2d4eaf522e04ca8ddde1ca5
2019-03-12 11:41:07 -07:00
Hans Boehm
28fdb8e282 Merge "Fix wp and sp comparison bugs" 2019-03-12 18:27:52 +00:00
Neil Fuller
9358e0972f Add an env variable for the tzdata module root
The ANDROID_TZDATA_ROOT maps to the /apex/com.android.tzdata
location on device like ANDROID_RUNTIME_ROOT maps to the
/apex/com.android.runtime location.

Bug: 128422035
Test: build only
Change-Id: Id90006004ca652564e530f3694600ac4afd798ed
2019-03-12 16:52:36 +00:00
David Anderson
22a01eed3a Merge "libfiemap_writer: Fix bugs in vfat handling."
am: 7f6d6db24d

Change-Id: I654e9ce9b72ad9f52a7324b36fe227e1750ae741
2019-03-12 09:39:31 -07:00
David Anderson
7f6d6db24d Merge "libfiemap_writer: Fix bugs in vfat handling." 2019-03-12 16:20:56 +00:00
Mark Salyzyn
0e505123e1 Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"
am: 8d246b22ee

Change-Id: I085793a341d1de0ef666a68933de4b923da53f94
2019-03-12 08:51:53 -07:00
Mark Salyzyn
8d246b22ee Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" 2019-03-12 15:44:29 +00:00
Gavin Corkery
8df32193f3 Rename data/pkg_staging to data/app-staging.
Test: atest apex_e2e_tests
Bug: 126330086

Change-Id: Ic5729d60046e8825a2a94e3c3483ea8232a69ed2
Merged-In: Ic5729d60046e8825a2a94e3c3483ea8232a69ed2
2019-03-12 15:38:44 +00:00
Kiyoung Kim
5ddcafbb52 Merge "Add product apk support from libnativeloader"
am: 23d774105e

Change-Id: I99f7ae5d0ca6b36eb6b57596ef83665c36904ff3
2019-03-12 02:05:46 -07:00
Kiyoung Kim
23d774105e Merge "Add product apk support from libnativeloader" 2019-03-12 08:48:46 +00:00
Josh Gao
983e1a5af2 Merge "adb: make root/unroot wait for the device to come back."
am: 59d4c8a352

Change-Id: I42b87ad02870afa07631c3a9b7a9468570f1f8ae
2019-03-11 21:10:23 -07:00
Treehugger Robot
59d4c8a352 Merge "adb: make root/unroot wait for the device to come back." 2019-03-12 04:01:00 +00:00
David Anderson
f9134aa1d5 libfiemap_writer: Fix bugs in vfat handling.
FIBMAP returns block numbers, whereas fiemap_writer was treating them as
byte offsets.

Bug: 126230649
Test: gsi_tool install to vfat works
Change-Id: Ice80128213425aa9601e381d0fbe53f9581bf596
2019-03-11 19:17:01 -07:00
Casey Dahlin
29f853d2e1 Merge "Add missing override keyword"
am: 8a1fb91e14

Change-Id: I830ffece013b56785a26f6b5463c401fb66a2eb1
2019-03-11 17:20:52 -07:00
Treehugger Robot
8a1fb91e14 Merge "Add missing override keyword" 2019-03-11 23:56:30 +00:00
Pirama Arumuga Nainar
747e647bd3 Merge "Support zero-length mapped files"
am: 2009e32008

Change-Id: I89720d38b64c3ef0143da80e7a26493ef8ff06c6
2019-03-11 16:12:50 -07:00
Josh Gao
b90db0840a Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE."
am: 22ff8e1909

Change-Id: I81b83555625d718443a61ddfdb19badb971845ec
2019-03-11 16:12:05 -07:00
Josh Gao
3c99b0f94f adb: make root/unroot wait for the device to come back.
Test: manually unplugged a device after adb root
Change-Id: I588283a666cc5e19d809d7ce81b5300398e8be2d
2019-03-11 15:59:09 -07:00
Treehugger Robot
2009e32008 Merge "Support zero-length mapped files" 2019-03-11 22:49:56 +00:00
Treehugger Robot
22ff8e1909 Merge "adbd: properly handle FUNCTIONFS_BIND without ENABLE." 2019-03-11 22:48:46 +00:00
Josh Gao
007a4dc7a6 adbd: properly handle FUNCTIONFS_BIND without ENABLE.
If a device is unplugged, a BIND will happen without an ENABLE until the
device is plugged in, which would previously result in adbd crashing
every 5 seconds due to an attempt to join a thread that hadn't been
started.

Bug: http://b/128255355
Test: manually observed adbd via serial cable while unplugged
Change-Id: I90d6384e7e829df1ffaf73a95f2418a2ff97fb03
2019-03-11 13:06:17 -07:00
Casey Dahlin
6e96f68cf3 Add missing override keyword
Fuchsia builds with Clang, and it's a bit pickier about always using
override when it's appropriate.

Test: None
2019-03-11 12:35:41 -07:00
The Android Open Source Project
4d916a1ece DO NOT MERGE - Merge PPRL.190305.001 into master
Bug: 127812889
Change-Id: I16a546dc24d3cf980ad7ab09895c0d97ee436224
2019-03-11 11:57:28 -07:00