Commit Graph

33484 Commits

Author SHA1 Message Date
Sebastian Pop e8fa0313ef Merge "add a performance benchmark for libziparchive" am: f8e96ea2d1 am: 48a6049eca
am: 8b44403ad6

Change-Id: Ib389678a5692faefff82077fb1af2835a9660661
2017-05-30 20:01:24 +00: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 0788831778 Merge "Respect that status property when parsing fstab from device tree" am: ea043a1d43 am: faad4c62f8
am: 485f5b606d  -s ours

Change-Id: Ic220dfe71d5a12b982d0e60eef14e5d0d192e2f4
2017-05-30 19:26:23 +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 d3e9cbb227 Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc" am: 8418634e70 am: 93e6339613
am: d89f523bdf  -s ours

Change-Id: I0c9097f952504a8b773c4a098bc762f6ed8d04bc
2017-05-30 18:50:51 +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
Sandeep Patil b472ef10c0 Respect that status property when parsing fstab from device tree
am: be4302bf58

Change-Id: Id7fa225c8e77154e6f37e40c5f1e15a7f16c2741
2017-05-27 03:31:28 +00:00
Sandeep Patil be4302bf58 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.

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>
2017-05-26 18:09:06 -07:00
George Burgess IV 2b496ca4af Merge "logging: always enable DCHECK for the static analyzer" am: 844940d751 am: 539c87b29a
am: 41ed46f9b4

Change-Id: Ie17cd4eee74856f4052425c2fe7480aa9d96fed5
2017-05-26 21:31:05 +00: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 c3579f0b06 Merge "ueventd: Break devices.cpp into discrete classes" am: c495e059b7 am: 18d0144e6c
am: cc0e43c8dd

Change-Id: I91dd47dcc55093a79a4b87f992191bcabe19f6bc
2017-05-26 00:22:10 +00: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 fbff313cc9 Merge "Fix warning on the build servers" am: 7b45384a7a am: 2968e8c28a
am: 60d2f533e2

Change-Id: I9e5ede2ee1fc306fad4fc20f84447c65913a2d9f
2017-05-25 21:42:25 +00: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 690f905d6a Merge "Load vendor public libraries to sphal namespace" am: f653eaa322 am: 1f09ef9f57
am: 24b3505203

Change-Id: Ie40f82dfbc6f5a69e7e3f44200d82c497a540879
2017-05-25 19:17:46 +00: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
Mark Salyzyn 79940ac5a4 Merge "liblog: test: android_logger_get_ "kernel" log buffer can be empty" into oc-dev
am: e57b353597

Change-Id: I847cd67bfd3f05f62bfc047b8fd59148246622b8
2017-05-25 18:39:26 +00:00
TreeHugger Robot 0a9042fadb Merge "resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp" into oc-dev-plus-aosp 2017-05-25 18:38:58 +00:00
Elliott Hughes 3e9223f460 Merge "Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/"" am: f9259b59e8 am: b2f12e42ca
am: 22cdddecba

Change-Id: I6e41d84c76a0d1f31e54d5422638817905f202f4
2017-05-25 18:18:40 +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 a06e0e067e Merge "liblog: test: CTS: enoent does not qualify" am: 34cfb3cbc6 am: 89df1a124e
am: 65e4eaa216

Change-Id: Ifb79cbd529edde0c261af39d8b3890d86f82d89c
2017-05-25 17:55:49 +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 68b95f93fc Merge "Mark libdiskconfig vendor_available." am: 102eb90837 am: 3ac2ae6077
am: 1ba95aea3a

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

Change-Id: I0ea205327e4d4ee030553e3201b80649cf239b80
2017-05-25 17:29:42 +00:00
Jayant Chowdhary 9a46e98802 Merge "Mark libprocinfo vendor_avaialable." am: 457ae84df7 am: 2c8e4971c4
am: a9d17ae63c

Change-Id: I108ac344850178dba02366070dccbfc2aad1f5f9
2017-05-25 17:29:29 +00:00