Dan Willemsen
42f9dd4997
Merge "Remove obsolete BRILLO variable" am: dbfbf85f0c
...
am: 2527add41a
Change-Id: Idc0c29c1accca9738755844c866859f440f7c94c
2018-03-12 22:05:38 +00:00
Dan Willemsen
2527add41a
Merge "Remove obsolete BRILLO variable"
...
am: dbfbf85f0c
Change-Id: I64c9e1b2dfb78af0bdddbd074398f36bdd20f327
2018-03-12 21:55:33 +00:00
Dan Willemsen
dbfbf85f0c
Merge "Remove obsolete BRILLO variable"
2018-03-12 21:26:03 +00:00
Bowgo Tsai
25994e6a9c
Merge "Adding /odm support" am: e25624aaea
...
am: 9a1eed4fda
Change-Id: I3b0788aa5ef55537169fbda24acc50daadcc22be
2018-03-12 19:47:47 +00:00
Bowgo Tsai
9a1eed4fda
Merge "Adding /odm support"
...
am: e25624aaea
Change-Id: I4b80c0475dd0a6d4d92425170fc87786ecd2b882
2018-03-12 19:34:32 +00:00
Daniel Mentz
3cf2b867b0
Merge "ueventd: Increase uevent buffer size to 2MB" am: 6d2a069f03
...
am: 78762588a6
Change-Id: If13861689b5794fe521d25670ab928e87ba51e00
2018-03-12 19:05:54 +00:00
Treehugger Robot
e25624aaea
Merge "Adding /odm support"
2018-03-12 19:00:25 +00:00
Daniel Mentz
78762588a6
Merge "ueventd: Increase uevent buffer size to 2MB"
...
am: 6d2a069f03
Change-Id: I12fe9e8c8796e7777bfdac8992e46e5922f6fbd2
2018-03-12 18:50:54 +00:00
Daniel Mentz
6d2a069f03
Merge "ueventd: Increase uevent buffer size to 2MB"
2018-03-12 18:36:52 +00:00
Daniel Mentz
636ed5fc72
ueventd: Increase uevent buffer size to 2MB
...
Let's increase the receive buffer size for the NETLINK_KOBJECT_UEVENT
socket to 2MB. Unless a large number of uevents queue up, that memory is
not allocated anyways. The receive buffer size serves only as an upper
limit for the total amount of memory consumed by all skbs queued to a
specific socket.
We experienced situations where ueventd got blocked for multiple seconds
while writing to /dev/kmsg, and the receive buffer overflowed in the
meantime.
Test: compile
Bug: 72648767
Change-Id: Ice6d7b9c5ed9c83efbad6111086ce95ac6432561
2018-03-12 11:35:02 -07:00
David Srbecky
46a0e0f83f
Merge "Don't implicitly dereference DW_CFA_def_cfa_expression." am: 6fe59afe53
...
am: 4243f8292a
Change-Id: Ic3fdd09b1c707b67968d0c7189cc5cace5f4e8c4
2018-03-12 10:40:34 +00:00
David Srbecky
4243f8292a
Merge "Don't implicitly dereference DW_CFA_def_cfa_expression."
...
am: 6fe59afe53
Change-Id: I20ad5a766bc53a1a561849fa2cb7de25ca5f924d
2018-03-12 10:31:57 +00:00
David Srbecky
6fe59afe53
Merge "Don't implicitly dereference DW_CFA_def_cfa_expression."
2018-03-12 10:17:04 +00:00
Dan Willemsen
fd72bde475
Remove obsolete BRILLO variable
...
Test: none
Change-Id: Iaf563b78819d63cb5ab7316a195a860b150d69c6
2018-03-10 15:41:37 -08:00
Andreas Gampe
da04c210b3
Merge "Base: Add default tag manipulation" into pi-dev
...
am: 23d45d1cc7
-s ours
Change-Id: Ia890b545d7ffa0d9d2a63baaeee62f7017665b76
2018-03-10 06:24:20 +00:00
Andreas Gampe
d7a0880554
Base: Add default tag manipulation
...
am: 3aa893647c
-s ours
Change-Id: If6a78cb8cc3e0d54c2971c815f6599878badb01d
2018-03-10 04:52:54 +00:00
TreeHugger Robot
23d45d1cc7
Merge "Base: Add default tag manipulation" into pi-dev
2018-03-10 03:09:52 +00:00
Steven Moreland
de07f6b485
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
am: f546acd3fa
-s ours am: 9ce034ce8a
-s ours am: 4e13bf0e73
-s ours
...
am: 432cdb6391
-s ours
Change-Id: Ia4dffeb6a8c0684ac05e051e01e17b0ef562cb72
2018-03-09 23:35:53 +00:00
Steven Moreland
eb1d5491b5
String16: remove integer overflows am: 0e5fbea01c
am: b02e0ab211
am: 1549baa415
...
am: f50ca832cd
Change-Id: I9080d1f7558012cfc11524b0ab1165d7049f8db9
2018-03-09 22:38:16 +00:00
Andreas Gampe
3aa893647c
Base: Add default tag manipulation
...
Allow the default tag (the program name) to be overwritten.
(cherry picked from commit 1923e768ef
)
Bug: 34867873
Test: m
Test: logging_test
Test: manual
Merged-In: I4ef32bad413a7cc82e46ce16a2f26212925964b1
Change-Id: I4ef32bad413a7cc82e46ce16a2f26212925964b1
2018-03-09 13:20:05 -08:00
Yabin Cui
2ff3196fce
Merge "base: Add TemporaryFile::DoNotRemove()." am: 04bf02374c
...
am: 8e7844d69e
Change-Id: Iaec0312075a7b9c5dbed490271ab5183e3e163d5
2018-03-09 20:17:38 +00:00
Yabin Cui
8e7844d69e
Merge "base: Add TemporaryFile::DoNotRemove()."
...
am: 04bf02374c
Change-Id: I414f7b2be3bc945d8ba829f388bc0dee10219c9c
2018-03-09 19:46:15 +00:00
Yabin Cui
04bf02374c
Merge "base: Add TemporaryFile::DoNotRemove()."
2018-03-09 19:10:47 +00:00
Bowgo Tsai
00749affc4
Adding /odm support
...
Treble system-as-root GSI needs to work on devices with and without /odm
partition. This change creates the following symlinks for devices without
/odm partition:
/odm/app ->/vendor/odm/app
/odm/bin ->/vendor/odm/bin
/odm/etc ->/vendor/odm/etc
/odm/firmware ->/vendor/odm/firmware
/odm/framework ->/vendor/odm/framework
/odm/lib -> /vendor/odm/lib
/odm/lib64 -> /vendor/odm/lib64
/odm/overlay -> /vendor/odm/overlay
/odm/priv-app -> /vendor/odm/priv-app
For devices with odm partition, /odm will be used as the mount point and
those symlinks will be hidden after mount.
Bug: 70678783
Test: boot a A/B device without /odm partition, checks those symlinks exist
Test: boot a A/B device with /odm partition, checks those symlinks don't exist
Change-Id: I4d960b52e2754f461188f3ab562c751f502046ea
2018-03-09 17:34:29 +08:00
Steven Moreland
432cdb6391
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
am: f546acd3fa
-s ours am: 9ce034ce8a
-s ours
...
am: 4e13bf0e73
-s ours
Change-Id: Ib936ca8e664938dce3c4f6f12e0d26f165c6e2d1
2018-03-09 03:10:02 +00:00
Steven Moreland
4e13bf0e73
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
am: f546acd3fa
-s ours
...
am: 9ce034ce8a
-s ours
Change-Id: I6dc6d1628deb2992d292672a20e1b7209ca8fcb5
2018-03-09 03:04:48 +00:00
Tom Marshall
57589be5a1
Merge "fs_mgr: Ignore invalid DT device nodes" am: d457091c3d
...
am: cf299d4a66
Change-Id: I84366c584c46f656d6cf71f30243bf5d9f07e053
2018-03-09 03:00:30 +00:00
Steven Moreland
9ce034ce8a
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
...
am: f546acd3fa
-s ours
Change-Id: I00bb77d99b2e4548215a64a80d89c214b0759c10
2018-03-09 02:57:24 +00:00
Tom Cherry
a81c709261
Merge changes I443e733f,If1e89a67,I0481d87a am: c602f5ab60
...
am: 7bf9de633f
Change-Id: I2919cb477d04bca91bc715d6497b2e8f224e33ea
2018-03-09 02:46:39 +00:00
Tom Marshall
cf299d4a66
Merge "fs_mgr: Ignore invalid DT device nodes"
...
am: d457091c3d
Change-Id: Ib67d4a15d1076fd13f5dab572107499cd40bbe9c
2018-03-09 02:30:58 +00:00
Tom Cherry
7bf9de633f
Merge changes I443e733f,If1e89a67,I0481d87a
...
am: c602f5ab60
Change-Id: Ib2e85a1ba02783ea95786120e2d74df403c38558
2018-03-09 02:28:08 +00:00
Treehugger Robot
d457091c3d
Merge "fs_mgr: Ignore invalid DT device nodes"
2018-03-09 02:25:59 +00:00
Tom Cherry
c602f5ab60
Merge changes I443e733f,If1e89a67,I0481d87a
...
* changes:
init: document previously undocumentary service options
init: alphabetize service options in README.md
init: alphabetize service options
2018-03-09 02:08:27 +00:00
Yabin Cui
ef58cef982
base: Add TemporaryFile::DoNotRemove().
...
Bug: http://b/73127105
Test: none.
Change-Id: I563c12bfb629ddd630568dda4817fb10cc9940a8
2018-03-08 17:59:36 -08:00
Android Build Merger (Role)
f546acd3fa
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
am: dd95a7f10d
...
Change-Id: Ic2cae6509c07e60fe66494b4b37fc5f0d29f068e
2018-03-09 01:49:02 +00:00
Android Build Merger (Role)
dd95a7f10d
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
am: e9df4d52f7
...
Change-Id: Ifab7435d2c707247b64b6debccbdd00224bdc6af
2018-03-09 01:49:01 +00:00
Android Build Merger (Role)
e9df4d52f7
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
am: f479f90679
...
Change-Id: Ib19d60a2933bf9ca6aa7eaeb285055d0f2c01452
2018-03-09 01:49:00 +00:00
Android Build Merger (Role)
f479f90679
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
am: dc2153c913
...
Change-Id: Ia9d1a2f4387bdd11085163ffea0e99d22d43757f
2018-03-09 01:48:58 +00:00
Android Build Merger (Role)
dc2153c913
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
am: 35629db6fe
...
Change-Id: I1f668592187eef0bb882372f42529d147ce49786
2018-03-09 01:48:57 +00:00
Android Build Merger (Role)
35629db6fe
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
am: 4ca82d1d14
...
Change-Id: Ifc14cf3778241da9ba4d06e3e8913c08dec085ce
2018-03-09 01:48:55 +00:00
Android Build Merger (Role)
4ca82d1d14
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
am: 726007edf0
...
Change-Id: I61308a749e84d4a909d22e4365bbd403fcf67dd4
2018-03-09 01:48:54 +00:00
Android Build Merger (Role)
726007edf0
[automerger] String16: remove integer overflows am: d0648d8dc6
am: 9de539d0dd
...
Change-Id: Iaf27e11e7beb60499e8c44c8659a13a02c923cbd
2018-03-09 01:48:53 +00:00
Android Build Merger (Role)
9de539d0dd
[automerger] String16: remove integer overflows am: d0648d8dc6
...
Change-Id: Ib1bb7df40aac5be2ff7a704038279e4768b18f88
2018-03-09 01:48:52 +00:00
David Srbecky
3692f25199
Don't implicitly dereference DW_CFA_def_cfa_expression.
...
The specification isn't entirely clear. Follow the gdb interpretation.
Bug: 73954823
Test: libunwindstack_test
Change-Id: If72717f54eed84e442f43af19e615143a9796b68
2018-03-08 14:44:11 -08:00
Tom Cherry
cb336eef48
init: document previously undocumentary service options
...
These all should have been documented previously but haven't been.
Test: n/a
Change-Id: I443e733f06584bb09b68b404608c8a611bb2baa0
2018-03-08 14:41:20 -08:00
Tom Cherry
bbbfed6083
init: alphabetize service options in README.md
...
Test: n/a
Change-Id: If1e89a67a41279cab6acf3e38ff8eb5b77a274c1
2018-03-08 14:40:18 -08:00
Steven Moreland
f50ca832cd
String16: remove integer overflows am: 0e5fbea01c
am: b02e0ab211
...
am: 1549baa415
Change-Id: I3d528c5445b6cb0cd58f24743e6442a2aea2344a
2018-03-08 22:24:22 +00:00
Steven Moreland
1549baa415
String16: remove integer overflows am: 0e5fbea01c
...
am: b02e0ab211
Change-Id: I618aaf491fb6309a3e313f4eeed62f68822f574d
2018-03-08 22:20:15 +00:00
Steven Moreland
b02e0ab211
String16: remove integer overflows
...
am: 0e5fbea01c
Change-Id: I60af627000e8c8d4ad44dfafcfdea772afad3838
2018-03-08 22:13:10 +00:00
Tom Cherry
e2f341e8ce
init: alphabetize service options
...
Lists should always be alphabetized...
Test: treehugger
Change-Id: I0481d87ac62b59bbe8f328eeaaac1a84a05f20a9
2018-03-08 13:51:10 -08:00