Commit Graph

38294 Commits

Author SHA1 Message Date
Elliott Hughes 6d56f4b2a6 Merge "Add __attribute__((__format__)) to fastboot's die()." am: d1f0687fe9
am: 07f868c884

Change-Id: I904f70b6b7218f8479e0f450f74c5a26a50516e6
2018-01-09 23:27:07 +00:00
Elliott Hughes 07f868c884 Merge "Add __attribute__((__format__)) to fastboot's die()."
am: d1f0687fe9

Change-Id: I34d7df8401af08e4e69438585dc584254ff0d47a
2018-01-09 23:24:30 +00:00
Treehugger Robot d1f0687fe9 Merge "Add __attribute__((__format__)) to fastboot's die()." 2018-01-09 23:18:39 +00:00
Siarhei Vishniakou f82541140b Merge "Allow input system access to /dev/v4l-touch" am: f6363989f4
am: 31209d7ada

Change-Id: I632deff2bca30474d9cd603741f6423988180297
2018-01-09 22:02:53 +00:00
Siarhei Vishniakou 31209d7ada Merge "Allow input system access to /dev/v4l-touch"
am: f6363989f4

Change-Id: I1e785df69dc2126674478326b86101b5439802a0
2018-01-09 21:56:18 +00:00
Treehugger Robot f6363989f4 Merge "Allow input system access to /dev/v4l-touch" 2018-01-09 21:45:52 +00:00
Josh Gao ba269e7a79 Merge "adb/fastboot: switch over to shared AdbWinApi." am: ef213b6d5b
am: 77b6270194

Change-Id: I5ff69d62d1ee3e3eaca81a73dd6d2ca4ae60e45f
2018-01-09 20:05:08 +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
Josh Gao 77b6270194 Merge "adb/fastboot: switch over to shared AdbWinApi."
am: ef213b6d5b

Change-Id: I4d49fe6c8eb67f8301fb30916249fd8243b8d47a
2018-01-09 19:57:08 +00:00
Treehugger Robot ef213b6d5b Merge "adb/fastboot: switch over to shared AdbWinApi." 2018-01-09 19:49:23 +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 3d7fa22164 Add __attribute__((__format__)) to fastboot's die().
Also make the <android-base/stringprintf.h> macro less likely to collide.

Bug: N/A
Test: builds
Change-Id: I868a0a0002c9c53c1ec0670153df2af5f48fd969
2018-01-09 11:18:10 -08: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 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 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
Josh Gao b0449da977 adb/fastboot: switch over to shared AdbWinApi.
Bug: http://b/71721338
Test: manually ran adb/fastboot on windows
Change-Id: I9fee6ea4c0e07cbeb69a48e456161832a5994e7b
2018-01-08 16:45:30 -08: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
Treehugger Robot b91021a2a8 Merge "bootstat: Add more boot reasons." 2018-01-09 00:03:22 +00:00
Steve Paik 492fb091d8 Merge "Fix logging in libsuspend"
am: ac4f4721a0

Change-Id: I49c2de04f7388153be81d71b25c83c17295968b8
2018-01-08 23:38:18 +00:00
Luis Hector Chavez 66fa613dbb Merge "debuggerd_handler: set PR_SET_PTRACER before running crash_dump."
am: be10cae468

Change-Id: Id3920fc76909b7659034a33542d864fa62b92376
2018-01-08 23:37:43 +00:00
Treehugger Robot ac4f4721a0 Merge "Fix logging in libsuspend" 2018-01-08 23:32:26 +00:00
Treehugger Robot be10cae468 Merge "debuggerd_handler: set PR_SET_PTRACER before running crash_dump." 2018-01-08 23:32:22 +00:00
Dan Willemsen a852f95b53 Convert toolbox to Android.bp
This drops the *TOOLS automated logic, though since there are only
three tools now, that seems less important. It would have been possible
to implement that logic in a Go plugin, but that seems like a lot of
overkill to fix a few duplicated entries.

See build/soong/README.md for more information.

Test: mmma system/core/toolbox
Test: List of installed files is the same
Test: input.h-labels.h and tools.h are the same
Change-Id: I9753083c3f689e689e40001b998b39ad20509598
2018-01-08 15:03:21 -08:00
Tom Cherry 413f5138dd Merge "Add getprop to toolbox"
am: acaeeeed73

Change-Id: I7f716eb136b6f19b3d8c18e13904e68d2a3d1392
2018-01-08 22:37:13 +00:00