Commit graph

50985 commits

Author SHA1 Message Date
Steven Moreland
d0b343973c Merge "libprocessgroup users use libcutils" into qt-dev
am: c99582dc51

Change-Id: Ib150bad71b461c71355467ea0f21d5cebc3f7633
2019-06-18 16:48:52 -07:00
Steven Moreland
c99582dc51 Merge "libprocessgroup users use libcutils" into qt-dev 2019-06-18 23:06:54 +00:00
Steven Moreland
1ec3b78b67 libprocessgroup users use libcutils
libprocessgroup symbols are being moved into libcutils in order to
optimize linking/memory usage. libprocessgroup will no longer be
required in the future (however removing references to it will come
separately).

Bug: 135145426
Test: boot

Test:
BEFORE:
$ adb shell showmap -a $(pid hwservicemanager) | grep -P "libprocessgroup|libcutils" -A1 | grep -P 'libprocessgroup|libcutils|\.bss' | awk '{s += $9}END{print s}'
28

AFTER:
$ adb shell showmap -a $(pid hwservicemanager) | grep -P "libprocessgroup|libcutils" -A1 | grep -P 'libprocessgroup|libcutils|\.bss' | awk '{s += $9}END{print s}'
12

Change-Id: I10d7c2d2b2b14cbbe0a128b9156d31206419d24c
2019-06-18 22:03:54 +00:00
Daniel Rosenberg
ca8f5ade91 Merge "Start Vold on early-fs" into qt-dev
am: d6253fc917

Change-Id: Ifc23a45193c3b615f1e64d1ab5b48dfa86aa5df7
2019-06-18 12:55:55 -07:00
TreeHugger Robot
d6253fc917 Merge "Start Vold on early-fs" into qt-dev 2019-06-18 19:17:01 +00:00
Hridya Valsaraju
771944aaff Merge "Remove system/core/mkbootimg" am: b89a4434ba
am: e966ac3666

Change-Id: I3d1e48b13b20536fb9ec863abf743ee12ca41342
2019-06-18 09:37:06 -07:00
Hridya Valsaraju
e966ac3666 Merge "Remove system/core/mkbootimg"
am: b89a4434ba

Change-Id: I136fc5fc85046d97d9ecb495f009e51e3ab91fdc
2019-06-18 09:26:08 -07:00
Treehugger Robot
b89a4434ba Merge "Remove system/core/mkbootimg" 2019-06-18 16:10:40 +00:00
Suren Baghdasaryan
77190e1a4b Merge "Remove ACgroupController_getFlags to fix API breakage" am: ad6f656be2
am: 27b827b01b

Change-Id: I74f89f910b389c9d81c989120623fa250e0ff2ee
2019-06-17 18:52:20 -07:00
Suren Baghdasaryan
27b827b01b Merge "Remove ACgroupController_getFlags to fix API breakage"
am: ad6f656be2

Change-Id: Ie607e89e78212b199323277a008a625a8c205255
2019-06-17 18:43:24 -07:00
Treehugger Robot
ad6f656be2 Merge "Remove ACgroupController_getFlags to fix API breakage" 2019-06-18 01:26:31 +00:00
Steven Moreland
bb7b7273df Merge "libprocessgroup: move native_bridge_support" am: 716ba5d91d
am: 445c327040

Change-Id: I3c12b8c896e8640b7e3149b35607a40652d0daf4
2019-06-17 17:12:18 -07:00
Steven Moreland
445c327040 Merge "libprocessgroup: move native_bridge_support"
am: 716ba5d91d

Change-Id: I4f321bd72bdf2ec72394f060e99f3b0ae78a20a2
2019-06-17 16:58:17 -07:00
Suren Baghdasaryan
37e8a78c49 Merge "Remove ACgroupController_getFlags to fix API breakage" into qt-dev
am: fb888f6565

Change-Id: I2ba813bbb061135ab1d535a90cb7830e49765a1d
2019-06-17 16:35:25 -07:00
Treehugger Robot
716ba5d91d Merge "libprocessgroup: move native_bridge_support" 2019-06-17 23:33:46 +00:00
David Anderson
e7f69de114 Merge "liblp: Remove the slot-suffix requirement in MetadataBuilder." am: bc53c842e9
am: 32fd128402

Change-Id: Ic6fdadc40ca1527808e703893cac97938df6a9a3
2019-06-17 16:33:19 -07:00
David Anderson
32fd128402 Merge "liblp: Remove the slot-suffix requirement in MetadataBuilder."
am: bc53c842e9

Change-Id: If10a824b6c521e9c8fd8a581720a6839f5f0fdf5
2019-06-17 16:22:48 -07:00
Suren Baghdasaryan
fb888f6565 Merge "Remove ACgroupController_getFlags to fix API breakage" into qt-dev 2019-06-17 23:22:30 +00:00
David Anderson
bc53c842e9 Merge "liblp: Remove the slot-suffix requirement in MetadataBuilder." 2019-06-17 22:58:20 +00:00
Dongcheol Shin
03d67a38d0 [automerger skipped] Merge "Support importing property file with expanded name" into qt-dev
am: fa94b8f96b -s ours
am skip reason: change_id If3fdcf620a5d717e0930b1e4e58261bc8f79ec24 with SHA1 a87c0f99ad is in history

Change-Id: I2fef32ad141aa382409dda5111cf23dc8c5ec321
2019-06-17 15:56:09 -07:00
Daniel Rosenberg
1be83e30c5 Start Vold on early-fs
We need vold on early-fs so we can handle userdata checkpointing.
Without this, devices will take an extra minute or two as checkpointing
related vdc calls attempt to reach vold before it is available.

Bug: 134114000
Test: Boot, see vold has started before vdc checkpointing tries to call
      out to vold.

Change-Id: Idfdb304503a163fbb91f9317949eb98c06fecce1
2019-06-17 22:30:44 +00:00
TreeHugger Robot
fa94b8f96b Merge "Support importing property file with expanded name" into qt-dev 2019-06-17 22:30:28 +00:00
Steven Moreland
b495b0d403 libprocessgroup: move native_bridge_support
To avoid merge conflict.

Bug: 135293492
Bug: 135298384
Test: N/A
Change-Id: I034b989c7e0f8a477b29ef7ca40bba8f2dc929e5
2019-06-17 12:48:06 -07:00
Steve Muckle
655c0bc123 VtsKernelLiblpTest: use static test
am: 9b90198887

Change-Id: I99012be6a30464b172c404615ac1450f90e39fc0
2019-06-17 10:22:39 -07:00
Suren Baghdasaryan
aa1d54f0cc Remove ACgroupController_getFlags to fix API breakage
Since ACgroupController_getFlags was introduced after LLNDK freeze it
causes media crashes due to missing symbol. Remove the new function and
re-implement cgroup controller detection to not require flags field but
instead check for its existence on the first access.

Bug: 135049992
Test: libcutils_test with and without CONFIG_CPUSETS enabled
Change-Id: I0220d6a926884dc22a7424d7d0a980c379c6f4eb
Merged-In: I0220d6a926884dc22a7424d7d0a980c379c6f4eb
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-06-17 16:49:36 +00:00
Suren Baghdasaryan
338260a467 Remove ACgroupController_getFlags to fix API breakage
Since ACgroupController_getFlags was introduced after LLNDK freeze it
causes media crashes due to missing symbol. Remove the new function and
re-implement cgroup controller detection to not require flags field but
instead check for its existence on the first access.

Bug: 135049992
Test: libcutils_test with and without CONFIG_CPUSETS enabled
Change-Id: I0220d6a926884dc22a7424d7d0a980c379c6f4eb
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-06-17 16:46:23 +00:00
Tom Cherry
b1411b2b2c Merge "Create android-base/format.h that includes fmtlib headers" am: 7f34035f08
am: 3b4ec0387b

Change-Id: Ie95237af25a18cd0d56493722aad07aa787457ae
2019-06-17 08:04:55 -07:00
Tom Cherry
013e58f1fe Merge "init: use Errorf() now that we have it" am: 30f6f42c04
am: b0481c01af

Change-Id: I82c26654fc317b213a3120d00800dcb1fcfe9572
2019-06-17 08:04:26 -07:00
Tom Cherry
3b4ec0387b Merge "Create android-base/format.h that includes fmtlib headers"
am: 7f34035f08

Change-Id: I08899b7e7d6f800cb028948b4da0f096832c958b
2019-06-17 07:55:07 -07:00
Tom Cherry
b0481c01af Merge "init: use Errorf() now that we have it"
am: 30f6f42c04

Change-Id: Icffd0963da20708508e761e57f54f0c441570f98
2019-06-17 07:54:24 -07:00
Tom Cherry
7f34035f08 Merge "Create android-base/format.h that includes fmtlib headers" 2019-06-17 14:42:32 +00:00
Tom Cherry
30f6f42c04 Merge "init: use Errorf() now that we have it" 2019-06-17 14:42:20 +00:00
Josh Gao
7c3b87ffd2 Merge "Revert "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND."" am: a6f90ce599
am: 099fc95530

Change-Id: Iaa1d67735ed8a4c582c42b630cf90c2c384fd2f6
2019-06-14 16:55:35 -07:00
Josh Gao
099fc95530 Merge "Revert "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND.""
am: a6f90ce599

Change-Id: I39fd7c134b47dd2601a9bec6a013eb73568f9c4a
2019-06-14 16:44:34 -07:00
Josh Gao
a6f90ce599 Merge "Revert "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND."" 2019-06-14 23:25:35 +00:00
Steve Muckle
941d1e7121 Merge "VtsKernelLiblpTest: use static test" am: 6860f68475
am: 94697281d0

Change-Id: Ic8f9e2bdf47ead09fe9dccc0162122a857be0f11
2019-06-14 16:22:29 -07:00
Josh Gao
9dba0f5824 Revert "adbd: don't close ep0 until we receive FUNCTIONFS_UNBIND."
We're only reading FUNCTIONFS_BIND on creation upon the first creation
of the control fd, which results in an abort when rebind happens (e.g.
when MTP is enabled) and we unexpectedly read FUNCTIONFS_BIND in the
second instantiation of the connection.

This reverts commit 2b668d3906.

Bug: http://b/135155652
Test: manually enabled MTP
2019-06-14 16:21:21 -07:00
Steve Muckle
94697281d0 Merge "VtsKernelLiblpTest: use static test"
am: 6860f68475

Change-Id: If6957eb82469bf687cb804fb6a54d73a3e6b0ed5
2019-06-14 16:11:18 -07:00
Steve Muckle
9b90198887 VtsKernelLiblpTest: use static test
To avoid introducing dependencies on target libraries, use a statically
compiled test instead.

Bug: 134912860
Test: run vts-kernel -m VtsKernelLiblpTest
Change-Id: Ie24cc8532c7821cb225c024c240c4d485557bfa7
2019-06-14 16:10:25 -07:00
Treehugger Robot
6860f68475 Merge "VtsKernelLiblpTest: use static test" 2019-06-14 23:00:48 +00:00
Jaegeuk Kim
fb43140c31 Merge "fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr" am: c47618662f
am: 394e2ad0a2

Change-Id: I7b51b1083ae666a4692b25993175f88fc489de60
2019-06-14 15:19:48 -07:00
Jaegeuk Kim
394e2ad0a2 Merge "fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr"
am: c47618662f

Change-Id: Ic3daa609c300fc6fa009a2c5dfd417cc4462bfb4
2019-06-14 15:11:11 -07:00
Tom Cherry
f4db2aad57 init: use Errorf() now that we have it
Init had some pretty horrid Error() << StringPrintf(...) calls that
are all much better replaced by Errorf(...) now.

Test: build, check that keyword_map errors look correct
Change-Id: I572588c7541b928c72ae1bf140b814acdef1cd60
2019-06-14 22:07:32 +00:00
Tom Cherry
b90dcc07d3 Create android-base/format.h that includes fmtlib headers
We're already including fmtlib statically in libbase, so let's also
expose its functionality directly.

Also create a small benchmark of the most common operations for
format() and StringPrintf(): int, float, and string arguments.  Note
that fmt::format is faster than StringPrintf() in all of these cases.

Test: build, run benchmark
Change-Id: I1e18f13673dd89ea936ea5c51418fad723495b08
2019-06-14 14:55:27 -07:00
Jaegeuk Kim
c47618662f Merge "fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr" 2019-06-14 21:49:18 +00:00
Tom Cherry
b208032521 Merge "Add Errorf and ErrnoErrorf" am: ebbe9e7391
am: a7c8b3c49f

Change-Id: Ie8b87bd13a324b9cc97b69a7a179e3e056919498
2019-06-14 11:47:33 -07:00
Tom Cherry
a7c8b3c49f Merge "Add Errorf and ErrnoErrorf"
am: ebbe9e7391

Change-Id: I2d748929f5db5a06aaa685f0ae8dba75bdae637e
2019-06-14 11:39:26 -07:00
Steve Muckle
83019575ac VtsKernelLiblpTest: use static test
To avoid introducing dependencies on target libraries, use a statically
compiled test instead.

Bug: 134912860
Test: run vts-kernel -m VtsKernelLiblpTest
Change-Id: Ie24cc8532c7821cb225c024c240c4d485557bfa7
2019-06-14 11:37:09 -07:00
Tom Cherry
ebbe9e7391 Merge "Add Errorf and ErrnoErrorf" 2019-06-14 18:12:00 +00:00
Jaegeuk Kim
f07d07bf47 fs_mgr_fstab: translate reserve_root to reserved_size in fsmgr
Without this patch, fstab should decribe reserve_root=[# of 4KB blocks] in
f2fs mount option as well as reserved_size=[KB] in fsmgr flag to notify it
to framework.
With this patch, it should be just fine to use reserve_root=[# of 4KB blocks]
in fstab.

Bug: 135003600
Test: checked vold.has_reserved
Change-Id: Iab75f7da9792ad205a6c4d2d0f1eba8c16a5266a
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2019-06-14 17:38:33 +00:00