Commit graph

26276 commits

Author SHA1 Message Date
Dan Willemsen
695e6182d3 Merge changes Ia0ca36fc,Ib42c0635
am: 1abc3cd641

Change-Id: I67bfecac71d4fef20835dab3d226ec3d54847fa0
2016-11-30 06:06:07 +00:00
Dan Willemsen
32010171bd Enable liblog on host bionic
am: 0910d2dbb9

Change-Id: I127b74998a678bc69c70cabcbdcf5586feb80172
2016-11-30 06:06:06 +00:00
Dan Willemsen
69b0123549 Enable libbase/libutils/libziparchive on host bionic
am: ab34b47b35

Change-Id: If8e762eace58a494efede9ef5cb09be99b74e5b8
2016-11-30 06:05:59 +00:00
Treehugger Robot
1abc3cd641 Merge changes Ia0ca36fc,Ib42c0635
* changes:
  Enable liblog on host bionic
  Enable libbase/libutils/libziparchive on host bionic
2016-11-30 05:59:53 +00:00
Daniel Rosenberg
895cd44bd9 Merge "Switch sdcardfs over to bind mounts."
am: 94b9e4df04

Change-Id: I2dc89613d382ea5fd86bd1a1736310d3e8e49dbc
2016-11-30 05:20:40 +00:00
Treehugger Robot
94b9e4df04 Merge "Switch sdcardfs over to bind mounts." 2016-11-30 05:15:33 +00:00
Nick Kralevich
604ed83934 Merge "delete toolbox/r.c"
am: 08f0c4c998

Change-Id: I2725b81599d2b90473a96e0748911ca3bbf46211
2016-11-30 04:32:54 +00:00
Treehugger Robot
08f0c4c998 Merge "delete toolbox/r.c" 2016-11-30 04:27:32 +00:00
Nick Kralevich
8a475f7e4a delete toolbox/r.c
/dev/mem has been turned off on all Android kernels (b/19549480). This
utility cannot be used.

Test: android compiles.
Change-Id: I500021f224febb15dd8bfe6e1f6e5c398fe6f552
2016-11-29 15:45:11 -08:00
Dan Willemsen
0910d2dbb9 Enable liblog on host bionic
Some of the __BIONIC__ checks were actually looking for an android
device. Host bionic has __BIONIC__, but not __ANDROID__.

Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ia0ca36fc9486fe8ea7e5d1b2e26ab0491903723c
2016-11-29 13:39:55 -08:00
Dan Willemsen
ab34b47b35 Enable libbase/libutils/libziparchive on host bionic
Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ib42c063532c1cbeb3e1418ab16a1fb54d5902aab
2016-11-29 13:38:53 -08:00
Mark Salyzyn
10f4044341 Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL"
am: 9bfd9f558b

Change-Id: Ief7fcc4f7dd8086186b38c091fed626560ca7215
2016-11-29 19:46:50 +00:00
Treehugger Robot
9bfd9f558b Merge "system/core: replace EVENT_TAG_MAP_FILE with NULL" 2016-11-29 19:37:48 +00:00
Josh Gao
c58f49bf1b Merge changes I1d03564f,I883e4e6c
am: 5b21deb786

Change-Id: I0a92e6f94174c76731159957172a6596cb9147ce
2016-11-29 18:18:50 +00:00
Josh Gao
b6e9e5ddde adb: be more permissive in test_push_error_reporting.
am: 79ce3fe7db

Change-Id: I1239b5af85edca9ae6fa1a38f755b5707bbc614b
2016-11-29 18:18:49 +00:00
Josh Gao
68fd28e334 adb: make sure that file mode macros match linux.
am: 05a3abfef3

Change-Id: I39a6938adc8b9b1da0185d36a1891f755bf2ca38
2016-11-29 18:18:44 +00:00
Elliott Hughes
c509c36892 Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""
am: a10bd47d60

Change-Id: Ibad56dbe843c16863a70552ea27aa3e7ffca0787
2016-11-29 18:14:19 +00:00
Treehugger Robot
5b21deb786 Merge changes I1d03564f,I883e4e6c
* changes:
  adb: be more permissive in test_push_error_reporting.
  adb: make sure that file mode macros match linux.
2016-11-29 18:13:07 +00:00
Treehugger Robot
a10bd47d60 Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE"" 2016-11-29 18:05:51 +00:00
Billy Lau
6be1d976f6 Merge "init: Reworked how we wait for COLDBOOT_DONE"
am: 57c31d0f17

Change-Id: I40c0183e3bc22bc85977e4e8db3b4ce6ad76375e
2016-11-29 16:36:37 +00:00
Elliott Hughes
a452660d92 Revert "init: Reworked how we wait for COLDBOOT_DONE"
This reverts commit d36115ef2f.

Change-Id: I599b0eeebf9c062852323f2a4a986b18dd85288a
2016-11-29 16:34:56 +00:00
Billy Lau
57c31d0f17 Merge "init: Reworked how we wait for COLDBOOT_DONE" 2016-11-29 16:31:12 +00:00
Daniel Rosenberg
fc592327a9 Switch sdcardfs over to bind mounts.
Sdcardfs has been modified to use bind mounts
in place of three separate mounts. This lowers
resource usage, and removes a number of race
conditions around updates via differnt views.

Test: Run storage cts tests with sdcardfs enabled
Change-Id: Icdc196ba3d6f46d54d27ef91c01ffebcf81dd47e
2016-11-28 20:07:54 -08:00
Ting-Yuan Huang
a2c763de6f Merge "toolbox: exit when failed to allocate buffer for ioctl"
am: 16017b3fbb

Change-Id: I9b83aa7be127654ab1997393cd118d57d01a1122
2016-11-23 01:44:02 +00:00
Treehugger Robot
16017b3fbb Merge "toolbox: exit when failed to allocate buffer for ioctl" 2016-11-23 01:40:04 +00:00
Nick Kralevich
5fae86b5fa Merge "change /data/bugreports to /bugreports"
am: 1b2e6abf3b

Change-Id: I7de15de91a688f8fe4a203a84b54e7dcfa106782
2016-11-23 00:11:13 +00:00
Treehugger Robot
1b2e6abf3b Merge "change /data/bugreports to /bugreports" 2016-11-23 00:06:30 +00:00
Ting-Yuan Huang
1c2f612c18 toolbox: exit when failed to allocate buffer for ioctl
This is a "shouldn't happen" case.

Test: make WITH_TIDY=1 mmma system/core/toolbox
Change-Id: I51e44e17837b03d6df6f8c4c3e1aeab8253e094d
2016-11-22 15:33:34 -08:00
Billy Lau
d36115ef2f init: Reworked how we wait for COLDBOOT_DONE
Bug: 31800756

Instead of strictly timing out after 1s waiting for COLDBOOT_DONE,
we wait for a considerably longer period of time, which would also
allow slower non-production heavily instrumented debug builds to
boot up.

Upon successful wait, we measure the time taken and record the
value into a system property: ro.cold_boot.duration.

If timeout is still reached, we log an error message and abandon
boot process, rebooting into recovery mode instead.

Change-Id: Ic1df80546d8721b0e8c998ff294d5c5102de4e98
2016-11-22 21:25:02 +00:00
Jin Qian
960584eeb0 Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master"
am: 72662414f6

Change-Id: I2d761ee4db65f6c5c98f3cea2f58588e4bc66ec5
2016-11-22 18:47:38 +00:00
Jin Qian
72662414f6 Merge "fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master" 2016-11-22 18:42:39 +00:00
Nick Kralevich
c4084c6694 change /data/bugreports to /bugreports
It's 5 characters shorter, has no runtime costs, can be stored on a
read-only partition, and avoids problems like b/27262109 and b/27204904.
It allows makes some security hardening easier.

Bug: 27262109
Bug: 27204904
Bug: 32799236
Test: verified new symlink created and old one not present
Change-Id: Ief362e13569ad9c868a7f0f9c4dbd6a328c96c6b
2016-11-22 08:57:25 -08:00
Mark Salyzyn
a95e19abd2 Merge "liblog: add private android_log_write_list_buffer()"
am: 636c851f8d

Change-Id: If0c24576c69b9d2aad6637c7548d61f79173e932
2016-11-22 15:56:49 +00:00
Mark Salyzyn
d96b925d9c Merge "liblog: move android_log_event_context class to log/log_event_list.h"
am: 418558f8af

Change-Id: I4f537d4010e60b86ad4f565135804cf92fa7bd37
2016-11-22 15:56:32 +00:00
Treehugger Robot
636c851f8d Merge "liblog: add private android_log_write_list_buffer()" 2016-11-22 15:53:32 +00:00
Treehugger Robot
418558f8af Merge "liblog: move android_log_event_context class to log/log_event_list.h" 2016-11-22 15:51:38 +00:00
Josh Gao
79ce3fe7db adb: be more permissive in test_push_error_reporting.
Be agnostic to whether /system is writable when testing push error
reporting.

Test: python test_device.py
Change-Id: I1d03564fa35442c20e2c96a7f5b56d39868efc52
2016-11-21 18:39:21 -08:00
Josh Gao
05a3abfef3 adb: make sure that file mode macros match linux.
We use <sys/stat.h> mode macros on the host to parse modes sent over
from the device, so they had better match. Add static_asserts to ensure
this.

(Also, fix the cases where they don't.)

Test: mma -j48, compiled the static_asserts on darwin manually
Change-Id: I883e4e6c7489ea64d3c02d26790ac8293366d989
2016-11-21 18:39:21 -08:00
Mark Salyzyn
1179eb8048 system/core: replace EVENT_TAG_MAP_FILE with NULL
NULL represents system default.  In the future, NULL could represent
static and dynamic tags, which can come from multiple files based on
implementation details in the liblog library.

Test: gTest logd-unit-tests & liblog-unit-tests
Bug: 31456426
Change-Id: I0e3d296de81ca299ae63d7b83781639ee67ec298
2016-11-21 11:13:02 -08:00
Mark Salyzyn
2ca4f49476 liblog: add private android_log_write_list_buffer()
Allows us to compose an event message for our own in-memory purposes.
Will be used to compose an event message in logd and directly write
it to just the pmsg buffer.  Provide an internal enhanced C++ wrapper
for event handling.

Test: gTest liblog-unit-tests --gtest_filter=liblog.android_log_write_list_buffer
Bug: 31456426
Change-Id: I98246898ba580f9e506baba8af2fd1b26a2a8aae
2016-11-21 09:46:39 -08:00
Mark Salyzyn
472245d962 liblog: move android_log_event_context class to log/log_event_list.h
rename class from android_log_event_context to android_log_event_list

Test: gTest logcat-unit-tests
Bug: 31992412
Bug: 31456426
Change-Id: Ib61cbca7d453837d64959c56b0e11f8c5edbfbdd
2016-11-21 09:46:34 -08:00
Nick Kralevich
715e33452e init.rc: delete extra whitespace
causes merge conflicts.

Test: none
Change-Id: Ic83db2b3e2f972955efadfc8df8fe8ec918a7609
2016-11-19 16:07:40 -08:00
Evgenii Stepanov
4b1a329309 Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage."""
am: b6552f376c

Change-Id: I3291276426ad5e1acb457da7ad938958d7f0f461
2016-11-19 00:51:33 +00:00
Treehugger Robot
b6552f376c Merge "Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""" 2016-11-19 00:48:14 +00:00
Jin Qian
0067e03251 fs_mgr: change MF_MAX_COMP_STREAMS define to match internal master
Change-Id: I53a8c6158b4dd1bf5e14ef0a842b7f43ca8bae31
2016-11-18 16:38:40 -08:00
Peter Enderborg
3c4dfb6fc4 Merge "Add support for max_comp_streams option for zram"
am: a9ea1e4d99

Change-Id: I0ef7127e1352b7dc9ae226bee7fe340d864f97ab
2016-11-18 23:25:21 +00:00
Treehugger Robot
a9ea1e4d99 Merge "Add support for max_comp_streams option for zram" 2016-11-18 23:09:44 +00:00
Evgenii Stepanov
102daa30a3 Revert "Revert "init: create /dev/urandom, /dev/random in first stage.""
This reverts commit 4c8a76e250.

Test: booted angler-userdebug

Change-Id: I2257a44b7cf624065e5653754062a117f3e44c98
2016-11-18 15:09:18 -08:00
Peter Enderborg
4d217f02d3 Add support for max_comp_streams option for zram
With this option the fstab can include a parameter for zram
the enables more streams for kernels that does not have
dynamic stream task handling.

Test: Made sure max_comp_streams is set according to fstab.
Change-Id: I22e158a075a8a86b4e80d3b13989896929c0d223
2016-11-18 21:19:25 +00:00
Mark Salyzyn
2cfd0e08e9 Merge "logd: add EXIT command"
am: 16300f192b

Change-Id: Idd68cfba26f8fcc928db4fe2483d30e5d4f49a59
2016-11-18 16:10:23 +00:00