Elliott Hughes
1c9f13f7e5
Merge "fastboot: fix log print type mismatch" am: a1e27d342e
am: da2f629bcd
...
am: adc63a0973
Change-Id: I4e433c82ad479a5001bef225bc39fed4ec72ee31
2018-01-09 20:22:51 +00:00
Luis Hector Chavez
0a2a8abb53
Merge "libcutils: Stop checking the uid of netlink messages" am: f008571a4f
am: 91bfcbe31e
...
am: 8585431494
Change-Id: I676790ffebcf1a08720361d83d8e6f30a1053160
2018-01-09 20:20:01 +00:00
Benoit Lamarche
d5d8e7a4f0
Merge "Revert "Add getprop to toolbox"" am: fde1cee92e
am: ea66b5520e
...
am: 0267907761
Change-Id: I08c61a05fc1f2af2c54c6f1599853ed4584b7082
2018-01-09 20:18:48 +00:00
Justin Yun
fc86b1fee0
Merge "Removed unused part in ld.config.txt.in" am: 8fa3e72846
am: 7b7339d339
...
am: ebf514bab3
Change-Id: Ib94c656453658409081f6820a5901ab75de8fa60
2018-01-09 20:17:50 +00:00
Elliott Hughes
adc63a0973
Merge "fastboot: fix log print type mismatch" am: a1e27d342e
...
am: da2f629bcd
Change-Id: Id62dbc92bccf7088d1358831fb0e6381847d9c79
2018-01-09 20:04:22 +00:00
Luis Hector Chavez
8585431494
Merge "libcutils: Stop checking the uid of netlink messages" am: f008571a4f
...
am: 91bfcbe31e
Change-Id: Idda419d20f2c4cda0f5817ed5153ef9f3dc8d606
2018-01-09 20:01:47 +00:00
Benoit Lamarche
0267907761
Merge "Revert "Add getprop to toolbox"" am: fde1cee92e
...
am: ea66b5520e
Change-Id: I202e71842589b287156c1844b027fd169ddda21d
2018-01-09 19:31:35 +00:00
Justin Yun
ebf514bab3
Merge "Removed unused part in ld.config.txt.in" am: 8fa3e72846
...
am: 7b7339d339
Change-Id: I1defa232ac408da85327203ad4b8e1da472ea360
2018-01-09 19:30:50 +00:00
Elliott Hughes
da2f629bcd
Merge "fastboot: fix log print type mismatch"
...
am: a1e27d342e
Change-Id: Icb0d38f5383529a97bac67bacc33ceafb0b7b7e6
2018-01-09 19:03:59 +00:00
Elliott Hughes
a1e27d342e
Merge "fastboot: fix log print type mismatch"
2018-01-09 18:59:07 +00:00
Luis Hector Chavez
91bfcbe31e
Merge "libcutils: Stop checking the uid of netlink messages"
...
am: f008571a4f
Change-Id: Ia0dc17a8c22a32c99997063740511eb18b091b45
2018-01-09 17:42:21 +00:00
Treehugger Robot
f008571a4f
Merge "libcutils: Stop checking the uid of netlink messages"
2018-01-09 17:35:31 +00:00
Benoit Lamarche
ea66b5520e
Merge "Revert "Add getprop to toolbox""
...
am: fde1cee92e
Change-Id: I26fd811738d02b69e3105458d0bdab88bf7c0b5d
2018-01-09 15:10:11 +00:00
Benoit Lamarche
fde1cee92e
Merge "Revert "Add getprop to toolbox""
2018-01-09 15:06:07 +00:00
Tom Cherry
e69ba761a3
Revert "Add getprop to toolbox"
...
This reverts commit c73497e17a
.
Change-Id: Id6b84c86781a6ad7b675c10f142c3daa4117ec46
2018-01-09 15:53:00 +01:00
Justin Yun
7b7339d339
Merge "Removed unused part in ld.config.txt.in"
...
am: 8fa3e72846
Change-Id: I2cdaeccbd9d313bce1a473badd96f55eda2821c5
2018-01-09 08:14:15 +00:00
Treehugger Robot
8fa3e72846
Merge "Removed unused part in ld.config.txt.in"
2018-01-09 08:10:38 +00:00
Dan Willemsen
7aac215498
Merge "Convert toolbox to Android.bp" am: 603826f857
am: 0b3e2d4499
...
am: a0ea18e131
Change-Id: I5187d1b01de091de8b78cd89a395c5ef81076481
2018-01-09 06:45:27 +00:00
James Hawkins
4eb817b9c3
Merge "bootstat: Add more boot reasons." am: b91021a2a8
am: 14079b588c
...
am: 727d8ef488
Change-Id: Ic428c41e6a7fdf269bfcef809fb21388aaeef186
2018-01-09 06:44:31 +00:00
Steve Paik
5312feda77
Merge "Fix logging in libsuspend" am: ac4f4721a0
am: 492fb091d8
...
am: 720bdaf28d
Change-Id: I545ef80fb1870cc177fa30036b1f4691527282d6
2018-01-09 06:43:55 +00:00
Luis Hector Chavez
df53f4d005
Merge "debuggerd_handler: set PR_SET_PTRACER before running crash_dump." am: be10cae468
am: 66fa613dbb
...
am: 8b4cbf4a91
Change-Id: I5a6f242e96681be678a337d802b178ef92231dba
2018-01-09 06:43:15 +00:00
Tom Cherry
74c050b0da
Merge "Add getprop to toolbox" am: acaeeeed73
am: 413f5138dd
...
am: e59b297fcc
Change-Id: Iede59b99737e643fd93ed7328b63cfe646187f98
2018-01-09 06:41:55 +00:00
Dan Willemsen
a0ea18e131
Merge "Convert toolbox to Android.bp" am: 603826f857
...
am: 0b3e2d4499
Change-Id: I28228d67c0bfa0ed815b18227e706958b79bdbb2
2018-01-09 06:25:18 +00:00
James Hawkins
727d8ef488
Merge "bootstat: Add more boot reasons." am: b91021a2a8
...
am: 14079b588c
Change-Id: I19d23065992ebeaf9950c173fc9ce61886bcffb2
2018-01-09 06:24:30 +00:00
Steve Paik
720bdaf28d
Merge "Fix logging in libsuspend" am: ac4f4721a0
...
am: 492fb091d8
Change-Id: I956a41d32bad8f343df2dd7d26857f7217254f81
2018-01-09 06:23:58 +00:00
Luis Hector Chavez
8b4cbf4a91
Merge "debuggerd_handler: set PR_SET_PTRACER before running crash_dump." am: be10cae468
...
am: 66fa613dbb
Change-Id: Ibc6b1d14e3f0494b1f200af38793cca39f8947b1
2018-01-09 06:23:17 +00:00
Tom Cherry
e59b297fcc
Merge "Add getprop to toolbox" am: acaeeeed73
...
am: 413f5138dd
Change-Id: I07438a76a9da90ef8e69d786677b20277003d106
2018-01-09 06:21:55 +00:00
Dan Willemsen
0b3e2d4499
Merge "Convert toolbox to Android.bp"
...
am: 603826f857
Change-Id: I430509d1541fc3f6cd91f3200a8a26c6025bf1b8
2018-01-09 06:07:49 +00:00
Treehugger Robot
603826f857
Merge "Convert toolbox to Android.bp"
2018-01-09 06:01:26 +00:00
Justin Yun
939f06b429
Removed unused part in ld.config.txt.in
...
In the namespace with "isolated = false", "permitted.paths" is not
used.
Bug: 71727966
Test: walleye device boot
Change-Id: I6f624be3c4e2c4070bb784632d0757408ec12db0
2018-01-09 14:13:40 +09:00
Changrong Jin
e69917c59c
fastboot: fix log print type mismatch
...
Test: mma -j8
Change-Id: I8b4373f4a044b802fc9f1dd4f998e880f7843b4a
2018-01-09 11:29:54 +08:00
Steven Moreland
6e15dfc0c3
Merge "Use override_export_include_dirs." am: affd4e9bd9
am: c89b767401
...
am: 25a8d084f6
Change-Id: Ie72a68b427ae3679c3f9e857b0587b8128e8055f
2018-01-09 01:56:13 +00:00
Elliott Hughes
2397800bf5
Merge "Sort devices list before output." am: 18cdd3502a
am: e93f4e82ad
...
am: 62e480bcb9
Change-Id: I9b0c7b13b21c4c38babb069dc7cedaa15dfc580a
2018-01-09 01:55:27 +00:00
Mike Frysinger
df9b7d90ba
Merge "adb: add missing condition_variable include" am: 6097150de6
am: 4a3a792c24
...
am: 4b8ff4e601
Change-Id: I7a3e3c0ef09aa02cc0b556fbe2066e987e7f3752
2018-01-09 01:54:51 +00:00
Tom Cherry
74090bc7ca
Merge "Make property_info_checker a static executable for CTS" am: 830fd168de
am: 4e763cf4c9
...
am: c2d95cbec0
Change-Id: I5b05a7074d620d8a380bbe4b5052c4cdcc10f53a
2018-01-09 01:54:02 +00:00
Victor Hsieh
5e66cce1a2
Merge "Change seccomp to the system filter" am: 1406d991a3
am: 003b330540
...
am: 4e3bac206f
Change-Id: Ic833afcebfcc4db44c48153d9ab7fc7d7017aaa9
2018-01-09 01:51:03 +00:00
Christopher Morin
017ec6d3a3
Merge "fs_mgr: don't log error messages when missing fstab" am: ace69b2f7b
am: e8493e7045
...
am: 9396edfd2a
Change-Id: I5a492d206299ff0841342796a483dbaebecabad5
2018-01-09 01:50:06 +00:00
Jeff Sharkey
f431cd84e4
Merge changes from topic "resgidz" am: a7004e5fed
am: b162da3a47
...
am: c16340c646
Change-Id: Iaf01b79c1e51f4cba06ee9ea6227c00a3cec4d4d
2018-01-09 01:49:29 +00:00
Andreas Gampe
2e0c629448
Merge "Nativeloader: Add minimal effort for host library path" am: 01ccde321f
am: f9138787d3
...
am: 9c7799345c
Change-Id: I518fd78583acf5d4254d2047d712ba7f123da43a
2018-01-09 01:41:53 +00:00
Steve Muckle
a1c5978967
Merge "rootdir: make sure the /odm mountpoint is always available" am: fcec40de0b
am: ada4b7782d
...
am: 34f29a86fd
Change-Id: Icbc30f9ed92163119307d7c5f25e06d9cd93e9a4
2018-01-09 01:22:16 +00:00
Steven Moreland
25a8d084f6
Merge "Use override_export_include_dirs." am: affd4e9bd9
...
am: c89b767401
Change-Id: I52c45129facb38dd0a346ac9cc5f0b82a92cf00e
2018-01-09 00:57:51 +00:00
Elliott Hughes
62e480bcb9
Merge "Sort devices list before output." am: 18cdd3502a
...
am: e93f4e82ad
Change-Id: I0a55bc85c506c8f4d10e4a730e2547f13ebfef14
2018-01-09 00:57:07 +00:00
Mike Frysinger
4b8ff4e601
Merge "adb: add missing condition_variable include" am: 6097150de6
...
am: 4a3a792c24
Change-Id: I47703540bb2fbb27895b7f90684f0de7db085c7d
2018-01-09 00:56:34 +00:00
Tom Cherry
c2d95cbec0
Merge "Make property_info_checker a static executable for CTS" am: 830fd168de
...
am: 4e763cf4c9
Change-Id: I7f2b7b2fbcb7e9784f50a747991aa5fc48268481
2018-01-09 00:55:52 +00:00
Victor Hsieh
4e3bac206f
Merge "Change seccomp to the system filter" am: 1406d991a3
...
am: 003b330540
Change-Id: Ia60015aedcf318456a2de1843d2584dffa5deccb
2018-01-09 00:53:03 +00:00
Christopher Morin
9396edfd2a
Merge "fs_mgr: don't log error messages when missing fstab" am: ace69b2f7b
...
am: e8493e7045
Change-Id: Ib3aeba78f190f5107bb08adac760035ebbb4d63a
2018-01-09 00:52:20 +00:00
Jeff Sharkey
c16340c646
Merge changes from topic "resgidz" am: a7004e5fed
...
am: b162da3a47
Change-Id: Iebe526ef318e7602ac55fb9822261554002df255
2018-01-09 00:51:41 +00:00
Andreas Gampe
9c7799345c
Merge "Nativeloader: Add minimal effort for host library path" am: 01ccde321f
...
am: f9138787d3
Change-Id: I069435892c78f45138dd72a54be94f0316ac4cb4
2018-01-09 00:45:06 +00:00
Steve Muckle
34f29a86fd
Merge "rootdir: make sure the /odm mountpoint is always available" am: fcec40de0b
...
am: ada4b7782d
Change-Id: I4bba06db4f3a3bd1a43692231ed4c8d11ddc2229
2018-01-09 00:39:45 +00:00
James Hawkins
14079b588c
Merge "bootstat: Add more boot reasons."
...
am: b91021a2a8
Change-Id: Idf7367b6a5bd099b19f811a015a59fc334902b24
2018-01-09 00:10:18 +00:00