Commit graph

46195 commits

Author SHA1 Message Date
Steven Moreland
0d9c2b3991 Merge "Move clang-formats to build." am: 66853db0a2
am: 9edd9ebe1d

Change-Id: I7170a1d515f7ce0c4c15c69da46db6f7ce9c005d
2019-01-28 21:39:28 -08:00
Greg Kaiser
c5ba3e1014 Merge "adb: Fix incorrect logging statement" am: 32aaba6dcf
am: d13559092c

Change-Id: Ie9c66e2fc1d74172b3f2420c4d9dc9b7ba7d0c5a
2019-01-28 21:38:40 -08:00
Tom Cherry
308f20ba24 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10 am: 561498e357
am: 80fba27032

Change-Id: Ideebaff704419c9a97d066ca97ead40935779118
2019-01-28 21:37:59 -08:00
Steven Moreland
9edd9ebe1d Merge "Move clang-formats to build."
am: 66853db0a2

Change-Id: I005a7e056c9050ec927f59a7f195ddc3f7d39773
2019-01-28 20:09:07 -08:00
Greg Kaiser
d13559092c Merge "adb: Fix incorrect logging statement"
am: 32aaba6dcf

Change-Id: I7900ad07fceb4472744ca0d0c159960dde9dfabf
2019-01-28 20:08:32 -08:00
Tom Cherry
80fba27032 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
am: 561498e357

Change-Id: Ia0ba17bfee3d97dd4390f942ec7931c2b7a68ea6
2019-01-28 20:07:59 -08:00
Treehugger Robot
66853db0a2 Merge "Move clang-formats to build." 2019-01-28 20:16:54 +00:00
Treehugger Robot
32aaba6dcf Merge "adb: Fix incorrect logging statement" 2019-01-28 20:10:50 +00:00
Tom Cherry
561498e357 Merge changes Ibdecf0c9,I41bd92a7,I5669ed10
* changes:
  fs_mgr: test parsing all mount and fs mgr options
  fs_mgr: convert parse_flags over to C++
  fs_mgr: store file_contents_mode and file_names_mode directly
2019-01-28 16:52:25 +00:00
chenbruce
17cc1c07cc Merge "Linker namespace configuration for the Resolv APEX." am: 2d3ef2a22f
am: c114fa270d

Change-Id: Ibaa49c2d1c994e4062fd56cda8a5ed05354a6a69
2019-01-28 08:43:49 -08:00
chenbruce
c114fa270d Merge "Linker namespace configuration for the Resolv APEX."
am: 2d3ef2a22f

Change-Id: I8762937b9fce9c87f4b12903a5923973238e739d
2019-01-28 08:20:04 -08:00
Treehugger Robot
2d3ef2a22f Merge "Linker namespace configuration for the Resolv APEX." 2019-01-28 15:21:52 +00:00
Greg Kaiser
fdb9800fcc adb: Fix incorrect logging statement
We were logging "fd.get()" after we had already done a
"std::move(fd)".  That won't log the value we were hoping for.
We instead cache the file descriptor value in a local int prior
to the move(), and log that.

Test: TreeHugger
Change-Id: I715874ac63329280ffb55881fb2590fb31dc2457
2019-01-28 06:17:44 -08:00
Nicolas Geoffray
5e3f606bf4 Merge "Make runtime namespace visible." am: 3ea7785ee9
am: 79c48f1a83

Change-Id: Idf39f173275cb6721bc5972ffd37be57847df9f1
2019-01-28 01:35:34 -08:00
Nicolas Geoffray
79c48f1a83 Merge "Make runtime namespace visible."
am: 3ea7785ee9

Change-Id: I74058f6dd78784359a87603ab5002c07656b4443
2019-01-28 01:29:27 -08:00
Nicolas Geoffray
3ea7785ee9 Merge "Make runtime namespace visible." 2019-01-28 09:16:21 +00:00
chenbruce
aa87fd5f7d Linker namespace configuration for the Resolv APEX.
Support netd to load resolv Apex.
Switch namespaces when switching library paths between
/system and the APEX, so that internal library dependencies in both
locations are loaded from their own directory.

Bug: 119527674
Test: make; flash; lsof -p $(pidof netd)
Test: 1. manual test datacall/wifi work
      2. manual test tethering work
      3. system/netd/tests/runtests.sh
Change-Id: I3f69e85f2f529636f0ef29a2d9d71ad582c46dfb
2019-01-28 16:42:58 +08:00
Hridya Valsaraju
88693e5be7 Merge "Make 'fastboot boot' command support boot header version 2" am: b44996bfa9
am: 863e8fb3b7

Change-Id: If3f29c4bf71a2752f07963788a4c73a0c065549a
2019-01-27 21:47:00 -08:00
Hridya Valsaraju
863e8fb3b7 Merge "Make 'fastboot boot' command support boot header version 2"
am: b44996bfa9

Change-Id: I81239dd72347ebbe5360c2bcf9c158c84dd8cb79
2019-01-27 21:40:54 -08:00
Treehugger Robot
b44996bfa9 Merge "Make 'fastboot boot' command support boot header version 2" 2019-01-28 05:34:52 +00:00
Christopher Ferris
7d605a8cb7 Merge "Add GetPrintableBuildID()." am: 49047d711b
am: 8bd4aa963a

Change-Id: Iac1eefa53aba2fb4a9553b1b0de6510befc603fd
2019-01-25 23:13:51 -08:00
Christopher Ferris
8bd4aa963a Merge "Add GetPrintableBuildID()."
am: 49047d711b

Change-Id: If23b529363e07473a498896ef493565f7a4cecb5
2019-01-25 23:09:38 -08:00
Christopher Ferris
49047d711b Merge "Add GetPrintableBuildID()." 2019-01-26 07:03:35 +00:00
Christopher Ferris
1efb1601bf Merge "Add a few leak check tests." am: ed7ca8bb14
am: 9a96618c9d

Change-Id: I2966cccd7712c04c95be5090b1e96d8600b3d5d4
2019-01-25 22:59:44 -08:00
Christopher Ferris
9a96618c9d Merge "Add a few leak check tests."
am: ed7ca8bb14

Change-Id: Icae3c879ca1abbd556a08d494556da14e92f2c12
2019-01-25 22:55:35 -08:00
Christopher Ferris
ed7ca8bb14 Merge "Add a few leak check tests." 2019-01-26 06:45:39 +00:00
Jiyong Park
d7add90cd3 Merge "Remove permitted path for non-isolated namespace" am: ce17f19bc8
am: 8f6b3ed826

Change-Id: Icaf906a27a1c88703dfda3431a573d3d010370fc
2019-01-25 22:15:33 -08:00
Jiyong Park
8f6b3ed826 Merge "Remove permitted path for non-isolated namespace"
am: ce17f19bc8

Change-Id: Ib81fa94e013c48eb155069438d701c75cff92950
2019-01-25 22:11:24 -08:00
Treehugger Robot
ce17f19bc8 Merge "Remove permitted path for non-isolated namespace" 2019-01-26 06:01:48 +00:00
Cody Schuffelen
00a8d2693f Merge "Add native vsock support to ADB." am: d290bb7ed8
am: 8435ddc499

Change-Id: Id4ea2bc3f4a9f91c190973967237c65daba1eff0
2019-01-25 21:41:26 -08:00
Cody Schuffelen
8435ddc499 Merge "Add native vsock support to ADB."
am: d290bb7ed8

Change-Id: I6acb0811ad5c1fb7ed521c59450d8a838a92faf3
2019-01-25 21:37:15 -08:00
Treehugger Robot
d290bb7ed8 Merge "Add native vsock support to ADB." 2019-01-26 05:25:28 +00:00
Wei Wang
e1c2e0d283 Merge "Fix path for default prop" am: 3c2c9d8d43
am: 9155524429

Change-Id: I85069417ceb4de45f88d49f2d6f3b4511e741746
2019-01-25 20:41:07 -08:00
Wei Wang
9155524429 Merge "Fix path for default prop"
am: 3c2c9d8d43

Change-Id: I9ceb4b7a02fcfd869aab0c28545bfb9d31ebb683
2019-01-25 20:36:57 -08:00
Treehugger Robot
3c2c9d8d43 Merge "Fix path for default prop" 2019-01-26 04:22:37 +00:00
Mark Salyzyn
c685a375dc Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging" am: 33cff00c1c
am: 7cc3afb98c

Change-Id: I7b9c1aa52e183c7ed385b79f287bbfad82f15707
2019-01-25 20:07:56 -08:00
Mark Salyzyn
7cc3afb98c Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging"
am: 33cff00c1c

Change-Id: Ia141090dee34971c219be0e57a228a03e20001af
2019-01-25 19:55:20 -08:00
Treehugger Robot
33cff00c1c Merge "fs_mgr: ReadDefaultFstab suppress ReadFstabFromDt logging" 2019-01-26 03:47:49 +00:00
Jiyong Park
c84bbb0079 Remove permitted path for non-isolated namespace
No reason to have permitted path for non-isolated namespace.

Bug: 123303398
Test: N/A
Change-Id: Iaddb358efab7a2017c17f74ee53a9d711646b57c
2019-01-26 11:34:40 +09:00
Cody Schuffelen
a05b64d432 Add native vsock support to ADB.
vsock is a socket address family for communicating into and out of
virtual machines. Addresses have a port and CID. The CID is unique to
each virtual machine on the computer. The VM host always has CID 2.
http://man7.org/linux/man-pages/man7/vsock.7.html

Inside the android guest, the adb daemon hosts a vsock server with
VMADDR_CID_ANY, automatically using the guest CID. The adb server
can now connect to addresses of the form vsock:cid:port, where the CID
must be specified and the port defaults to 5555.

This is a significant speed improvement for ADB connections in
Cuttlefish, with 150-200 MB/s for `adb push` and 100-150 MB/s for
`adb pull`. It also allows removing some proxying steps from Cuttlefish,
simplifying the full connection path, and removes a dependency on the
unstable ivshmem protocol.

Commands tested against a Cuttlefish VM with CID 3:
adb connect vsock:3:5555
adb -s vsock:3:5555 shell
adb disconnect vsock:3:5555

Supporting "adb disconnect" and "adb -s" required modifying some of the
parts that parse addresses / serials.

push/pull trials with native adb vsock support in cuttlefish:

100m: 1 file pushed. 297.6 MB/s (104857600 bytes in 0.336s)
100m: 1 file pushed. 270.3 MB/s (104857600 bytes in 0.370s)
100m: 1 file pushed. 271.7 MB/s (104857600 bytes in 0.368s)
100m: 1 file pushed. 250.5 MB/s (104857600 bytes in 0.399s)
100m: 1 file pushed. 277.1 MB/s (104857600 bytes in 0.361s)
100m: 1 file pushed. 263.5 MB/s (104857600 bytes in 0.379s)
100m: 1 file pushed. 242.6 MB/s (104857600 bytes in 0.412s)
100m: 1 file pushed. 271.8 MB/s (104857600 bytes in 0.368s)
100m: 1 file pushed. 267.1 MB/s (104857600 bytes in 0.374s)

/data/local/tmp/100m: 1 file pulled. 212.8 MB/s (104857600 bytes in 0.470s)
/data/local/tmp/100m: 1 file pulled. 236.7 MB/s (104857600 bytes in 0.423s)
/data/local/tmp/100m: 1 file pulled. 201.2 MB/s (104857600 bytes in 0.497s)
/data/local/tmp/100m: 1 file pulled. 255.6 MB/s (104857600 bytes in 0.391s)
/data/local/tmp/100m: 1 file pulled. 199.6 MB/s (104857600 bytes in 0.501s)
/data/local/tmp/100m: 1 file pulled. 214.6 MB/s (104857600 bytes in 0.466s)
/data/local/tmp/100m: 1 file pulled. 254.2 MB/s (104857600 bytes in 0.393s)
/data/local/tmp/100m: 1 file pulled. 212.5 MB/s (104857600 bytes in 0.471s)
/data/local/tmp/100m: 1 file pulled. 218.9 MB/s (104857600 bytes in 0.457s)
/data/local/tmp/100m: 1 file pulled. 223.6 MB/s (104857600 bytes in 0.447s)

Bug: 121166534
Change-Id: I50f21fb5c9acafb8daa789df4e28c9e1bbbbf2ef
Test: adb connect/shell/disconnect
2019-01-25 17:55:06 -08:00
Nicolas Geoffray
a9b4f2b66b Make runtime namespace visible.
So that ART can look it up by name.

Test: m && boots
Change-Id: Ib747a92e7decad2f9effe976a771a4eb0becc440
2019-01-26 01:06:43 +00:00
Tom Cherry
eb6da459a0 fs_mgr: test parsing all mount and fs mgr options
Test: these new unit tests
Change-Id: Ibdecf0c97b313dc157b982340ca022b617757383
2019-01-25 16:03:52 -08:00
Tom Cherry
151a17f015 fs_mgr: convert parse_flags over to C++
Fixes a bug where verify= and a path is not respected.
Keeps the default value of -1 for swap_prio, zram_size, and the vold
managed partition number in the case of not being able to parse their
values.

Test: fs_mgr unit tests, boot
Change-Id: I41bd92a7a2f9165d62134704cb7a1209d76a2071
2019-01-25 16:03:39 -08:00
Christopher Ferris
b1c9c20eb2 Add GetPrintableBuildID().
The GetBuildID() function returns the raw build id data, so add a function
to get the printable hex version of the data.

Bug: 120606663

Test: New unit tests pass.
Change-Id: Ia5aefc97457efb08bbd30ea96cbb2d47ae59f954
2019-01-25 14:31:37 -08:00
Josh Gao
60df9ecb5e Merge "adb: convert more stuff to unique_fd." am: 79f60a9bab
am: 7dcb91cbc8

Change-Id: Ic69dcb4d1c499dc8e4daffb13435f5f22dd1e030
2019-01-25 14:03:18 -08:00
Dongwon Kang
22bfd8727c Merge "Add mediametrics to ld.config.legacy.txt" am: 9819ade714
am: 1d80f81bd3

Change-Id: Ied4e694a50c00828c930a8ad4ffe4a0db1d12a77
2019-01-25 14:02:06 -08:00
Josh Gao
7dcb91cbc8 Merge "adb: convert more stuff to unique_fd."
am: 79f60a9bab

Change-Id: I3633efe24d2b337adca2ad39347faa7d1772a100
2019-01-25 13:56:15 -08:00
Dongwon Kang
1d80f81bd3 Merge "Add mediametrics to ld.config.legacy.txt"
am: 9819ade714

Change-Id: Id3d8f5b8e51ffa78cdf0b8898869ad5642aa343a
2019-01-25 13:52:58 -08:00
Josh Gao
79f60a9bab Merge "adb: convert more stuff to unique_fd." 2019-01-25 21:48:28 +00:00
Dongwon Kang
9819ade714 Merge "Add mediametrics to ld.config.legacy.txt" 2019-01-25 21:40:33 +00:00