Commit graph

30625 commits

Author SHA1 Message Date
Josh Gao
a08c949c7a Merge "adb: fix deadlock." am: 68599f5759
am: d5a2cdb72c

Change-Id: I671768311d2c2969bc5797efc43c84175b417ae7
2017-05-31 02:16:48 +00:00
Josh Gao
d5a2cdb72c Merge "adb: fix deadlock."
am: 68599f5759

Change-Id: I9c57920319ef8b76b313c6fa736a282fe54e857b
2017-05-31 02:12:20 +00:00
Treehugger Robot
68599f5759 Merge "adb: fix deadlock." 2017-05-31 02:03:42 +00:00
Josh Gao
d1a3e8f1ab adb: fix deadlock.
libusb hotplug callbacks are called with the libusb lock taken, and we
call into libusb with our local mutex, so we need to enforce an ordering
between the two. Instead of calling device_connected or
device_disconnected directly, enqueue them onto the main thread.

Bug: http://b/62200735
Test: manually hotplugged a device
Change-Id: Ic5d55db83b47f4bb60f124ce94ddfe06f5f1a0c6
2017-05-30 17:09:42 -07:00
James Hawkins
aa2dab59af Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." am: 45d0cbf00b
am: 9fb006b57a

Change-Id: Ie19ee731bfc9f7927ed70409524dec081c8a001b
2017-05-31 00:08:39 +00:00
James Hawkins
9fb006b57a Merge "bootstat: Log factory_reset_boot_complete separately from ota_*."
am: 45d0cbf00b

Change-Id: I1054febb3608368b7166916e15c7ee49840a6791
2017-05-31 00:04:39 +00:00
Tom Cherry
3d2aa93e1d Merge "init: allow ':' in property names" am: af95ecdb04
am: 6d2a27768d

Change-Id: I8eaadce8365b86f8a3cab36a18e4fa81901546d9
2017-05-30 23:57:40 +00:00
Treehugger Robot
45d0cbf00b Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." 2017-05-30 23:56:34 +00:00
Tom Cherry
6d2a27768d Merge "init: allow ':' in property names"
am: af95ecdb04

Change-Id: I0f7343072b365cc8cb46f231596f12ec945cee79
2017-05-30 23:53:37 +00:00
Tom Cherry
af95ecdb04 Merge "init: allow ':' in property names" 2017-05-30 23:43:28 +00:00
James Hawkins
0bc4ad479a bootstat: Log factory_reset_boot_complete separately from ota_*.
Bug: 37164359
Test: none
Change-Id: I7ed68e299846050fdffa58db8d2bd35fe4599dbb
2017-05-30 15:03:15 -07:00
Tom Cherry
1369379e33 init: allow ':' in property names
Bug: 62114389
Test: boot bullhead, get/set properties with ':' via command line
Test: trigger an init trigger with a property containing a ':'
Change-Id: Ib51853a1ef9d4f79d510c8175c0d9684e2025e23
2017-05-30 13:45:28 -07:00
Sebastian Pop
8b44403ad6 Merge "add a performance benchmark for libziparchive" am: f8e96ea2d1
am: 48a6049eca

Change-Id: I6667e494ac8cbca9663294e656344638b92f8c64
2017-05-30 19:57:53 +00:00
Sebastian Pop
48a6049eca Merge "add a performance benchmark for libziparchive"
am: f8e96ea2d1

Change-Id: I976683a9f9a468a171810eb837879de11e2ac953
2017-05-30 19:53:52 +00:00
Treehugger Robot
f8e96ea2d1 Merge "add a performance benchmark for libziparchive" 2017-05-30 19:44:52 +00:00
Sandeep Patil
485f5b606d Merge "Respect that status property when parsing fstab from device tree" am: ea043a1d43
am: faad4c62f8

Change-Id: If3523d7fd0ff91ee727bb3f021ce2c5c3739e0b6
2017-05-30 19:21:54 +00:00
Sandeep Patil
faad4c62f8 Merge "Respect that status property when parsing fstab from device tree"
am: ea043a1d43

Change-Id: Id23c5509001726781778721e7adb5b20a71fd407
2017-05-30 19:17:52 +00:00
Treehugger Robot
ea043a1d43 Merge "Respect that status property when parsing fstab from device tree" 2017-05-30 19:11:08 +00:00
Yueyao Zhu
d89f523bdf Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc" am: 8418634e70
am: 93e6339613

Change-Id: Idb97d7108e8c750739943b991a2468f3aa87fc83
2017-05-30 18:46:20 +00:00
Yueyao Zhu
93e6339613 Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc"
am: 8418634e70

Change-Id: I3848c66092e8f7f89e80697991df92a08a71e5ed
2017-05-30 18:42:20 +00:00
Treehugger Robot
8418634e70 Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc" 2017-05-30 18:33:08 +00:00
Sebastian Pop
0a94c56463 add a performance benchmark for libziparchive
This patch adds two benchmarks that measure the performance of some
operations of libziparchive.

Both benchmarks are creating a temporary zip file containing file
names of uniformly distributed lengths.  The creation of the zip
file is not timed in the benchmarks.

- FindEntry_no_match tries to find an inexisting entry in the files
  of the zip archive, in order to force the code to examine all the
  files in the archive.

- Iterate_all_files uses the iterate function to list all the files
  in the archive.

Bug: N/A
Test: adb shell /data/ziparchive-benchmarks
Change-Id: Ibdb524ba1c5ae55caddf0416ebbc09f8b6df0021
2017-05-30 10:50:14 -07:00
Sandeep Patil
02a5108308 Respect that status property when parsing fstab from device tree
For an fstab entry in device tree, fs_mgr now honors the status property
as done by linux. i.e. the node (in this case, the fstab entry) is
enabled if status is not set, "ok" or "okay". For every other value, the
node is considered as disabled.

Merged-In: I5ff8f710de2c54afc76b4af28108ca9075357ad1
Bug: 62127741
Test: Test sailfish w/ no status property, result: boots
Test: Test with status = "disabled", result: skips mounting /vendor
Test: Test with status = "ok", result: boots

Change-Id: I5ff8f710de2c54afc76b4af28108ca9075357ad1
Signed-off-by: Sandeep Patil <sspatil@google.com>
(cherry picked from commit be4302bf58)
2017-05-30 10:25:58 -07:00
George Burgess IV
41ed46f9b4 Merge "logging: always enable DCHECK for the static analyzer" am: 844940d751
am: 539c87b29a

Change-Id: I351610d18f877e8b81e7a61a0b26191771671cdf
2017-05-26 21:27:00 +00:00
George Burgess IV
539c87b29a Merge "logging: always enable DCHECK for the static analyzer"
am: 844940d751

Change-Id: Idf8c288d453ce24769eccb7296fe44b9df683254
2017-05-26 21:25:00 +00:00
Treehugger Robot
844940d751 Merge "logging: always enable DCHECK for the static analyzer" 2017-05-26 21:16:49 +00:00
George Burgess IV
7e771de38f logging: always enable DCHECK for the static analyzer
This helps us have less false-positives.

We do this instead of `#undef NDEBUG`, since undefing NDEBUG actually
gave us more false-positives (...and build breakages) than simply
leaving it defined.

Bug: None
Test: Ran the static analyzer across internal master. 213 fewer warnings
(15 Medium, 2 Low, the remainder are 'Analyzer'). All of the dropped
warnings I audited were false-positives. It adds ~3 Tidy warnings.
Change-Id: Ibedab60ca7e9d2b0772896222b83d2e7ab064afe
2017-05-26 11:04:48 -07:00
Tom Cherry
cc0e43c8dd Merge "ueventd: Break devices.cpp into discrete classes" am: c495e059b7
am: 18d0144e6c

Change-Id: Ia7a22c5856fcae4f0c75220118f60d0f20a3bb60
2017-05-26 00:19:37 +00:00
Tom Cherry
18d0144e6c Merge "ueventd: Break devices.cpp into discrete classes"
am: c495e059b7

Change-Id: I0ada340d4b422750fae7ec362834f48bc729789a
2017-05-26 00:16:44 +00:00
Tom Cherry
c495e059b7 Merge "ueventd: Break devices.cpp into discrete classes" 2017-05-25 23:51:49 +00:00
Tom Cherry
ed506f7356 ueventd: Break devices.cpp into discrete classes
devices.cpp handles too many things for creating one class.  This
change breaks it up into various files and classes.

* Parsing is moved to ueventd_parser.cpp
* Reading from the uevent socket and Cold booting is moved to a
  UeventListener class, in uevent_listener.cpp
* Firmware handling is moved to firmware_handler.cpp
* The remaining contents form a DeviceHandler class within devices.cpp

Bug: 33785894

Test: boot bullhead x40, observe no major differences in /dev and /sys
Test: boot sailfish x40, observe no major differences in /dev and /sys
Test: init unit tests

Change-Id: I846a2e5995fbb344c7a8e349065c18a934fa6aba
2017-05-25 16:17:19 -07:00
Dan Willemsen
60d2f533e2 Merge "Fix warning on the build servers" am: 7b45384a7a
am: 2968e8c28a

Change-Id: Id469da9b4370b21a2ece0e0c8cef1abc3300a04c
2017-05-25 21:37:24 +00:00
Dan Willemsen
2968e8c28a Merge "Fix warning on the build servers"
am: 7b45384a7a

Change-Id: Ieec42af50addac8a23997b830c8b4b0deff727cb
2017-05-25 21:32:23 +00:00
Treehugger Robot
7b45384a7a Merge "Fix warning on the build servers" 2017-05-25 21:21:45 +00:00
Dan Willemsen
ac98aac43f Fix warning on the build servers
ANDROID_BUILD_TOP is only defined if envsetup.sh is sourced, the current
directory in make is the top of the source tree.

Test: <fresh terminal> make -j nothing
Change-Id: I24834a6eeb6ac11de0cc19d84650daa086995d99
2017-05-25 12:35:40 -07:00
Dimitry Ivanov
24b3505203 Merge "Load vendor public libraries to sphal namespace" am: f653eaa322
am: 1f09ef9f57

Change-Id: Idc932799969b324056c046039b112bf236fbfcfe
2017-05-25 19:13:42 +00:00
Dimitry Ivanov
1f09ef9f57 Merge "Load vendor public libraries to sphal namespace"
am: f653eaa322

Change-Id: I6c3f0dba56109c2c76fe5ed29add750937f62ae4
2017-05-25 19:08:44 +00:00
Yueyao Zhu
f97d96b8f4 init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc
/init.${ro.hardware}.rc would sometime rely on being parsed before other
.rc files. In this case all vendors are still able to have a .rc file
included before all the ones in /vendor/etc/init.

Merged-In: I3fb6df13a39204a516874ea94f5e5ad84bca42c6
Bug: 38301110
Change-Id: I3fb6df13a39204a516874ea94f5e5ad84bca42c6
(cherry picked from commit f7c34ad4bf)
2017-05-25 12:02:32 -07:00
Treehugger Robot
f653eaa322 Merge "Load vendor public libraries to sphal namespace" 2017-05-25 19:00:11 +00:00
Elliott Hughes
22cdddecba Merge "Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/"" am: f9259b59e8
am: b2f12e42ca

Change-Id: I18ffd6f2f2843afa6534ba82caaf21e70f80e61e
2017-05-25 18:15:39 +00:00
Elliott Hughes
b2f12e42ca Merge "Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/""
am: f9259b59e8

Change-Id: If9cc2846d31c15b193f2367529d6bb80d100f059
2017-05-25 18:12:39 +00:00
Elliott Hughes
f9259b59e8 Merge "Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/"" 2017-05-25 18:05:39 +00:00
Mark Salyzyn
65e4eaa216 Merge "liblog: test: CTS: enoent does not qualify" am: 34cfb3cbc6
am: 89df1a124e

Change-Id: I0b05db556a881f55acabb404fe0a17e57209848d
2017-05-25 17:52:37 +00:00
Mark Salyzyn
89df1a124e Merge "liblog: test: CTS: enoent does not qualify"
am: 34cfb3cbc6

Change-Id: Ic9a6ffed0ea3d77d1973aafdbe4a7bddc786acbc
2017-05-25 17:49:08 +00:00
Mark Salyzyn
34cfb3cbc6 Merge "liblog: test: CTS: enoent does not qualify" 2017-05-25 17:44:50 +00:00
Dimitry Ivanov
882cad2d87 Load vendor public libraries to sphal namespace
Load vendor public libraries to sphal namespace
if it exists - preserve old behavior of loading
these libraries to default namespace if sphal
namespace is not present on the device.

Bug: http://b/37410104
Test: cts-tradefed run singleCommand cts --skip-preconditions -m CtsJniTestCases
      on marlin (with enabled sphal configuration) and on angler where ld.config.txt
      is not present.

Change-Id: Iaa3fa437ba2900acc2e5b9c78039fe1553e4c9dd
(cherry picked from commit af0264bbe9)
2017-05-25 10:30:55 -07:00
Jayant Chowdhary
1ba95aea3a Merge "Mark libdiskconfig vendor_available." am: 102eb90837
am: 3ac2ae6077

Change-Id: I1a14b7a6eac50d44439a313fa0b86d67689f8a7b
2017-05-25 17:24:25 +00:00
Jayant Chowdhary
2d8046f5cc Merge "Add vendor_available:true to libmemunreachable" am: e5bc59b5e0
am: 3446d20f23

Change-Id: I52216940f841e69ad07b357f8261d25cd98cbea1
2017-05-25 17:24:12 +00:00
Jayant Chowdhary
a9d17ae63c Merge "Mark libprocinfo vendor_avaialable." am: 457ae84df7
am: 2c8e4971c4

Change-Id: I9053e6cdbb42f49ad39efdd1f74b8ff7c9231abf
2017-05-25 17:23:59 +00:00
Jayant Chowdhary
89fc3a6525 Merge "Mark libsuspend vendor_available." am: 6e2d24ab5a
am: 1c8e482995

Change-Id: I0f4c365a213504392e7636eac1df01f7d15f4c69
2017-05-25 17:23:46 +00:00