Commit graph

46922 commits

Author SHA1 Message Date
Roland Levillain
5481e3aec8 Merge "Include tests directories in the linker legacy configuration."
am: d503239292

Change-Id: Ib9d4728884a2bb1dfe9c4b98f8b1d24cd9b254de
2019-03-19 05:24:49 -07:00
Roland Levillain
d503239292 Merge "Include tests directories in the linker legacy configuration." 2019-03-19 10:17:10 +00:00
Neil Fuller
6ac873c3b9 Merge "Address syntax / error case nits"
am: ed6b5177e2

Change-Id: Ia67f090ccc6c22d3c2ed1e25921094c9d2de5910
2019-03-19 02:50:30 -07:00
Neil Fuller
ed6b5177e2 Merge "Address syntax / error case nits" 2019-03-19 09:37:55 +00:00
Josh Gao
966b39b34c Merge "adb: fix uninitialized variable."
am: 588a87d68e

Change-Id: I87e9844a42d9a9e120a5f4e60149eb5ec3efbcdf
2019-03-18 20:20:43 -07:00
Treehugger Robot
588a87d68e Merge "adb: fix uninitialized variable." 2019-03-19 03:14:17 +00:00
Victor Hsieh
54f3e37edd Merge "mini-keyctl: use ParseInt to parse keys"
am: 8aa059438d

Change-Id: I3e2ce4749129943ea8dc9e0eaa74721e57f52c03
2019-03-18 17:48:15 -07:00
Treehugger Robot
8aa059438d Merge "mini-keyctl: use ParseInt to parse keys" 2019-03-19 00:25:52 +00:00
Josh Gao
b019574476 adb: fix uninitialized variable.
Previously, we were initializing IoBlock::pending when submitting a read,
but leaving it uninitialized when doing a write, which would sometimes
result in an assertion firing when we received a previously allocated
block of memory that happened to have a nonzero value in pending.

Test: treehugger
Change-Id: I434c65f554ceed313fea9cfcc98788908f3ca8bc
2019-03-18 17:12:19 -07:00
Victor Hsieh
1dd49e2de4 Merge "mini-keyctl cleanup: keep local funcitons static"
am: e16a253cb0

Change-Id: I1678657424220d02aa45f0f6428bcb925792e304
2019-03-18 15:12:01 -07:00
Treehugger Robot
e16a253cb0 Merge "mini-keyctl cleanup: keep local funcitons static" 2019-03-18 22:08:46 +00:00
Mark Salyzyn
25ccd57180 Merge "Check if we need to Poll for devices after RegenerateUevents"
am: 06e6b8551a

Change-Id: I569e3564d78636b1f79d4c20a161ff1120b94276
2019-03-18 14:11:10 -07:00
Treehugger Robot
06e6b8551a Merge "Check if we need to Poll for devices after RegenerateUevents" 2019-03-18 21:03:11 +00:00
Greg Kaiser
73308830a6 Merge "adb: Fix return value in error case"
am: 2925a580e9

Change-Id: I6fa794d11212e77650f6ffcfd7ee2e80092a9e0a
2019-03-18 14:01:02 -07:00
David Anderson
53fabb5a09 Merge changes I88689889,Ibfd66734
am: e2d977bffd

Change-Id: I01ca951c36aa0c0458296839810eac341b7b0b30
2019-03-18 14:00:01 -07:00
Victor Hsieh
0fb290bb8a mini-keyctl: use ParseInt to parse keys
- Valid ID format examples: 0x90a, 123
 - ID like 90a will not work now.

Bug: None
Test: mini-keyctl unlink 0x11d25c86 0x2873c96d

Change-Id: I057bce0a49a60f475d54b23e28dc18db25124466
2019-03-18 13:57:05 -07:00
Treehugger Robot
2925a580e9 Merge "adb: Fix return value in error case" 2019-03-18 20:32:46 +00:00
David Anderson
e2d977bffd Merge changes I88689889,Ibfd66734
* changes:
  liblp: Reclaim wasted space from unaligned partitions, v2.
  Revert "liblp: Reclaim wasted space from unaligned partitions."
2019-03-18 20:09:44 +00:00
Roland Levillain
5c99a0c067 Include tests directories in the linker legacy configuration.
Make ld.config.legacy.txt similar to other linker configurations with
respect to tests in /data/{nativetest,benchmarktest}{,64}.

Note: The linker legacy configuration is used by the ART generic build
targets, defined in project device/generic/art.

Test: ART chroot-based on-device testing using the master-art
Bug: 121117762
Change-Id: I6c8fafa2568862e450aa7b9fea1177a184cb9705
2019-03-18 19:07:32 +00:00
Mark Salyzyn
cdb825e461 Check if we need to Poll for devices after RegenerateUevents
If the required_devices_partition_names is cleared, no need to Poll.

Test: manual check boot time, and adb-remount-test.sh
Bug: 128834849
Change-Id: I044ee2752a7f32b084ff6e88b4b586accdfb78f0
2019-03-18 10:29:48 -07:00
Yifan Hong
98d4fc0d13 Merge changes from topic "libprocessgroup"
am: 830f837231

Change-Id: Icb325b97b2177538a2bcada2cd398f562e8f7da1
2019-03-18 10:06:09 -07:00
Yifan Hong
830f837231 Merge changes from topic "libprocessgroup"
* changes:
  libprocessgroup: Add VTS tests for vendor JSON files
  libprocessgroup_proto_test split into multiple files
2019-03-18 16:53:47 +00:00
Victor Hsieh
582c7b9b82 mini-keyctl cleanup: keep local funcitons static
Test: build
Bug: None
Change-Id: If58f496173d8afff9eb81ff7f5975ddaac765d18
2019-03-18 09:45:12 -07:00
Victor Hsieh
67111febbe Merge "mini-keyctl: support printing security label"
am: 9555bd40ce

Change-Id: Ia9d3afcc37c5b0b66f4214aad8acd1c8f1792070
2019-03-18 09:09:48 -07:00
Treehugger Robot
9555bd40ce Merge "mini-keyctl: support printing security label" 2019-03-18 15:52:28 +00:00
Greg Kaiser
5fe40a66b2 adb: Fix return value in error case
When we introduced __adb_check_server_version() as a function
returning a 'bool', we missed missed converting once instance
of "return -1;" to "return false;".  Thus, we're returning 'true'
in this case as our non-zero value gets implicitly converted to
'true'.

We fix this case as well with this CL.

Test: TreeHugger
Change-Id: I90b01567d927f36d2d963561b676b3bfabfcee49
2019-03-18 07:00:00 -07:00
Dongwon Kang
5698f77f5f Merge "List stable libraries media apex relies on."
am: fc0f79f8a8

Change-Id: I5acb7f6e867c40b929446d99d81c601837a1b5ac
2019-03-15 22:39:18 -07:00
Dongwon Kang
fc0f79f8a8 Merge "List stable libraries media apex relies on." 2019-03-16 05:34:09 +00:00
Josh Gao
a6397564b6 Merge "adb: avoid sign extension of shell return code."
am: b5ac15a936

Change-Id: Ib4018e339435eb8a4c79070c1096f076996d0386
2019-03-15 21:14:34 -07:00
Treehugger Robot
b5ac15a936 Merge "adb: avoid sign extension of shell return code." 2019-03-16 04:07:20 +00:00
Andreas Gampe
a0cc42381c Merge "Init: Load fsverity keys earlier"
am: f09ef56056

Change-Id: Id4fa13d970a379d449376be56a37eae1ac1f118b
2019-03-15 19:19:33 -07:00
Treehugger Robot
f09ef56056 Merge "Init: Load fsverity keys earlier" 2019-03-16 02:05:33 +00:00
Mark Salyzyn
7c55e2a88d Merge "init: add MountHandler property handler"
am: f2dadd019d

Change-Id: I4bcff7b7fa81b357710cb2a6df06ad6b93dccf9f
2019-03-15 18:25:30 -07:00
Treehugger Robot
f2dadd019d Merge "init: add MountHandler property handler" 2019-03-16 01:15:18 +00:00
Dongwon Kang
a013e3d53d List stable libraries media apex relies on.
With allow_all_shared_libs, the libs under /system/lib may be used
instead of libs included in the apex. This change adds stable libraries
the media apex relies on to prevent this case.

Test: dumpsys media.extractor, atest MediaPlayer2Test
Bug: 127791685

Change-Id: I6a0419e6da9e9f48a394257b1e8f977ec2dfa9a1
2019-03-15 17:23:03 -07:00
Yifan Hong
e8e2756f93 libprocessgroup: Add VTS tests for vendor JSON files
Test: vts_processgroup_validate_test
Bug: 123664216
Change-Id: I5518e34cde6fc30195fc99133f86cb23ae3be92f
2019-03-15 16:28:42 -07:00
Victor Hsieh
327037f063 mini-keyctl: support printing security label
Test: mini-keyctl security <key_id>
Bug: 128607724
Change-Id: If92b41d0aa96d626933546391b964ca2a8a48703
2019-03-15 16:01:01 -07:00
Josh Gao
e60f681f7c Merge "adb: attempt to exec newer adb servers on Linux."
am: eecd5cc532

Change-Id: Idceeb6dee8a2ecba374657dcb786d2a3960ea84d
2019-03-15 15:35:41 -07:00
Andreas Gampe
e8565ac94a Init: Load fsverity keys earlier
Keys may be required for apex updates (post-installs), so load them
before starting apexd.

Bug: 125474642
Test: m
Test: manual
Change-Id: I32ddb6ae6854334e8ee7e195173ecfaed565d783
2019-03-15 15:14:35 -07:00
Josh Gao
1e1ae45a8c adb: avoid sign extension of shell return code.
Windows has int32_t return codes, which results in return codes 128-255
being sign extended into a negative number. Manually truncate the return
codes we get to preserve their values.

Test: test_device.py on windows
Change-Id: If41d6d469350301704f6ecff72ad17b412db3e04
2019-03-15 14:54:32 -07:00
Josh Gao
eecd5cc532 Merge "adb: attempt to exec newer adb servers on Linux." 2019-03-15 21:54:10 +00:00
Yifan Hong
28a44eb6f6 libprocessgroup_proto_test split into multiple files
... so that they can be reused later.

Also, removed test to strull and inline static constexpr variable.

Bug: 123664216
Test: libprocessgroup_proto_test
Change-Id: Ia6b93c6689d7531e6f597d1387434aed1b3efb0a
2019-03-15 12:34:42 -07:00
Neil Fuller
3b0da85b22 Address syntax / error case nits
Observe some best practices in the APEX symlink
shell commands. No functional changes intended except with error
handling.

Bug: 128687472
Bug: 124106384
Bug: 122985829
Bug: 128249030
Test: make installclean / make droid / inspect one symlink
Change-Id: I099fed5ac8f25cc3911ce0e7ea2b9f74c2172193
2019-03-15 19:05:05 +00:00
Mark Salyzyn
a73ed22cb7 init: add MountHandler property handler
Set properties dev.mnt.blk.<mount_point>=<device_block_class> for mount
and umount operations by setting up an Epoll handler to catch
EPOLLERR or EPOLLPRI signals when /proc/mounts is changed.  Only
update properties associated with block devices.  For the mount
point of /, use the designation of /root instead.

Can use the properties in init rc expansion like:

on property dev.mnt.blk.root=*
    write /sys/block/${dev.mnt.blk.root}/queue/read_ahead_kb ${boot_read_ahead_kb:-2048}

on property dev.mnt.blk.data=*
    write /sys/block/${dev.mnt.blk.data}/queue/read_ahead_kb ${boot_read_ahead_kb:-2048}

on late-fs
    setprop boot_read_ahead_kb 128
    write /sys/block/${dev.mnt.blk.root}/queue/read_ahead_kb ${boot_read_ahead_kb}
    write /sys/block/${dev.mnt.blk.data}/queue/read_ahead_kb ${boot_read_ahead_kb}

Test: boot and inspect getprop results.
Bug: 124072565
Change-Id: I1b8aff44f922ba372cd926de2919c215c40ee874
2019-03-15 11:54:38 -07:00
Elliott Hughes
9403b8883c Merge "libprocessgroup: PLOG already includes strerror(errno)."
am: 0e5b74deff

Change-Id: Iedbb582e7d917e772bc0ddacb725733059120292
2019-03-15 08:27:26 -07:00
Elliott Hughes
0e5b74deff Merge "libprocessgroup: PLOG already includes strerror(errno)." 2019-03-15 15:19:22 +00:00
Jiyong Park
a4015c04df Merge changes from topic "apex_earlymount_no_bionic_bindmount"
am: 4cd0914048

Change-Id: If31c1ac798d3aacd2a2aaa1f1c6e0695e3952a82
2019-03-15 02:19:35 -07:00
Jiyong Park
8b9fa0a44d Revert "Handle adb sync with Bionic under /bionic"
am: fc97d2a116

Change-Id: I8c8780f0009795d281b93efa691791427402ef45
2019-03-15 02:18:42 -07:00
Jiyong Park
2f2b99a20d Don't bind-mount bionic files
am: 7b4801a921

Change-Id: I80ded3b5efbee209eb705556bc92e2708497da20
2019-03-15 02:17:48 -07:00
Treehugger Robot
4cd0914048 Merge changes from topic "apex_earlymount_no_bionic_bindmount"
* changes:
  /bionic path is gone
  Revert "Handle adb sync with Bionic under /bionic"
  Don't bind-mount bionic files
2019-03-15 09:02:18 +00:00