Commit Graph

33071 Commits

Author SHA1 Message Date
Josh Gao 9deb8140bf Merge changes I394f5782,I9475f5d0,I59707186 am: 44f6592b0d am: b7f3707cd3
am: 75f0275fba

Change-Id: Ie8656ad48bac17b5f5d90e1adeb4096f83b1176c
2017-05-10 19:35:36 +00:00
Josh Gao 75f0275fba Merge changes I394f5782,I9475f5d0,I59707186 am: 44f6592b0d
am: b7f3707cd3

Change-Id: Id2899cce43a39d099797ce9915b3d924cae41e75
2017-05-10 19:13:08 +00:00
Elliott Hughes 94ed60471d Merge "Fix style nits in adb's Android.mk." am: 30b7f59efc am: 86698112b9
am: eba1d8338f

Change-Id: I0b818e500c50a3a83c2cb00665e06fa5d69bcb3f
2017-05-10 19:04:44 +00:00
Josh Gao b7f3707cd3 Merge changes I394f5782,I9475f5d0,I59707186
am: 44f6592b0d

Change-Id: Ic1a62436b98f986e129a6b08d1ab939b70d5f3e6
2017-05-10 19:01:57 +00:00
Josh Gao 44f6592b0d Merge changes I394f5782,I9475f5d0,I59707186
* changes:
  adb: move all cleanup to a function with defined ordering.
  adb: make `adb kill-server` wait for the server to die.
  adb: libusb: replace sleep with timed CV wait.
2017-05-10 18:42:14 +00:00
Elliott Hughes eba1d8338f Merge "Fix style nits in adb's Android.mk." am: 30b7f59efc
am: 86698112b9

Change-Id: I1ebbd9a008f5d0cd0812d85802888a952ea77a1b
2017-05-10 18:36:43 +00:00
Elliott Hughes 86698112b9 Merge "Fix style nits in adb's Android.mk."
am: 30b7f59efc

Change-Id: I6a2ff9ba9967e16917397141ced113d5a884d826
2017-05-10 17:55:03 +00:00
Elliott Hughes 30b7f59efc Merge "Fix style nits in adb's Android.mk." 2017-05-10 17:43:54 +00:00
Elliott Hughes cd81886b94 Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d6b am: f2f3c3b91c
am: 8ff4dbe443

Change-Id: I1598a1aa314a2ec550596a4f92390a71d9cd6137
2017-05-10 15:42:08 +00:00
Elliott Hughes 8964fbfa5f Fix style nits in adb's Android.mk.
We [try to] always use trailing \s in lists.

Bug: N/A
Test: builds
Change-Id: Ibc1ccacbe8a31f784f206d29a8c4f0f4650f7bde
2017-05-10 08:41:50 -07:00
Elliott Hughes 8ff4dbe443 Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d6b
am: f2f3c3b91c

Change-Id: Id03922e268fed3174ca4d63976c31b682c4ab202
2017-05-10 15:34:37 +00:00
Elliott Hughes f2f3c3b91c Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space"
am: 3d29736d6b

Change-Id: I8b3fa683884606e441340940e52114c5f94bb484
2017-05-10 15:26:37 +00:00
Elliott Hughes 3d29736d6b Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" 2017-05-10 15:11:28 +00:00
SzuWei Lin b3526e1ee8 Fix build error when (ADB|FASTBOOT)_VERSION has space
Test: make, and build pass
Change-Id: I8fc608a5b8bccb43b8af72978ce16a945147f62d
2017-05-10 18:52:02 +08:00
George Burgess IV 8a30d83aa6 Merge "fix static-analyzer logging/CHECK macros" am: 01e7990a10 am: 951d7e953e
am: 543f2c68be

Change-Id: I42431a5908b7cad199d4c23dd908de561245b822
2017-05-10 03:18:46 +00:00
Dimitry Ivanov b738efe1a7 Merge "Explicitly enable greylist for classloader-namespaces" am: 2f2cd76d4d am: 55ecc6ff6f
am: fb669dc648

Change-Id: Ibdfa0fedb6093c84952ba5c5416f66c8ad2d37a5
2017-05-10 03:18:22 +00:00
George Burgess IV 543f2c68be Merge "fix static-analyzer logging/CHECK macros" am: 01e7990a10
am: 951d7e953e

Change-Id: I0d6055f7c055b4d841e02945d30074ce898aab5e
2017-05-10 03:13:18 +00:00
Dimitry Ivanov fb669dc648 Merge "Explicitly enable greylist for classloader-namespaces" am: 2f2cd76d4d
am: 55ecc6ff6f

Change-Id: I9a1514d4721902ce49058014d53b455e95bad5cb
2017-05-10 03:12:52 +00:00
George Burgess IV 951d7e953e Merge "fix static-analyzer logging/CHECK macros"
am: 01e7990a10

Change-Id: If2094a3c41fe95b6c5727e65cbd02cb6d88a08d8
2017-05-10 03:08:12 +00:00
Dimitry Ivanov 55ecc6ff6f Merge "Explicitly enable greylist for classloader-namespaces"
am: 2f2cd76d4d

Change-Id: I6dd5c358aa34da3166bfb5e7f579677f1ae2b7eb
2017-05-10 03:07:51 +00:00
Treehugger Robot 01e7990a10 Merge "fix static-analyzer logging/CHECK macros" 2017-05-10 03:05:40 +00:00
Treehugger Robot 2f2cd76d4d Merge "Explicitly enable greylist for classloader-namespaces" 2017-05-10 02:53:32 +00:00
Bowgo Tsai 8337de9630 Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" into oc-dev
am: 5f68b422bd

Change-Id: Ib27c377f2e02d30e0af219a2f08f90087ec11e51
2017-05-10 02:42:28 +00:00
TreeHugger Robot 5f68b422bd Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" into oc-dev 2017-05-10 02:22:41 +00:00
Elliott Hughes 3a92b606b5 Merge "Show the "platform tools" version in adb/fastboot --version." am: 6f4d47438d am: 3602f6141a
am: 92764e2cb2

Change-Id: Ib7cfaa61a86729ae9767315c9e962cf252bd0854
2017-05-10 02:12:18 +00:00
Bowgo Tsai acef4a9a09 Merge "first stage mount: removing the requirement of by-name prefix for AVB" am: cdad92fdad am: c82235ebbd
am: fec0b13902

Change-Id: I7dec7f517b5b1c601b4372a431789aba1375fbee
2017-05-10 02:11:06 +00:00
Elliott Hughes 92764e2cb2 Merge "Show the "platform tools" version in adb/fastboot --version." am: 6f4d47438d
am: 3602f6141a

Change-Id: I359a28e0a82ae7cb9e84ff8fe147c8f9baf87a86
2017-05-10 01:56:28 +00:00
Bowgo Tsai fec0b13902 Merge "first stage mount: removing the requirement of by-name prefix for AVB" am: cdad92fdad
am: c82235ebbd

Change-Id: I333b3437621ee611cb9033a8e0d1fbd78fcef8d0
2017-05-10 01:56:03 +00:00
Elliott Hughes 3602f6141a Merge "Show the "platform tools" version in adb/fastboot --version."
am: 6f4d47438d

Change-Id: I5ff109186b29b9770f61506eb4cfb99ce71db4e9
2017-05-10 01:51:38 +00:00
Bowgo Tsai c82235ebbd Merge "first stage mount: removing the requirement of by-name prefix for AVB"
am: cdad92fdad

Change-Id: Id15d51e8e7e6e4767bf965e22a109aa49cbc8d6e
2017-05-10 01:51:07 +00:00
Treehugger Robot 6f4d47438d Merge "Show the "platform tools" version in adb/fastboot --version." 2017-05-10 01:41:41 +00:00
Treehugger Robot cdad92fdad Merge "first stage mount: removing the requirement of by-name prefix for AVB" 2017-05-10 01:37:28 +00:00
Dimitry Ivanov 9e253ce6b7 Explicitly enable greylist for classloader-namespaces
The linker no longer enables greylist by default, it
needs to be explicitly enabled by specifying corresponding
flag.

Bug: https://issuetracker.google.com/38146125
Test: builds
Change-Id: Ib593f2d9a35dbadffb436f5fbc9a2a7a8f64ada0
(cherry picked from commit 058b2ea8c5)
2017-05-09 18:00:38 -07:00
Dimitry Ivanov 9c558921c5 Explicitly enable greylist for classloader-namespaces
am: 058b2ea8c5

Change-Id: I6e4dafd3fba623ce6bdb15286df5b8c9b1b299d6
2017-05-10 00:54:48 +00:00
Steven Moreland f52769a685 Merge "trusty*: Android.mk -> Android.bp" am: e732d15337 am: 1e0a523d68
am: 16e19d9aef

Change-Id: I4351a26bfbf6785f0cf13729ae01facc01ff2c56
2017-05-09 23:40:58 +00:00
Elliott Hughes 3994897e7d Merge "Make fastboot command-line parsing a bit more like adb." am: 0a253390d1 am: f22da9a1ba
am: 42996de2dc

Change-Id: I1afc56e502dc3db32f68e568d5493303902079a5
2017-05-09 23:40:21 +00:00
Steven Moreland 16e19d9aef Merge "trusty*: Android.mk -> Android.bp" am: e732d15337
am: 1e0a523d68

Change-Id: I37655976bb5daa06df4d0896119415a72bc3419d
2017-05-09 22:49:25 +00:00
Elliott Hughes 42996de2dc Merge "Make fastboot command-line parsing a bit more like adb." am: 0a253390d1
am: f22da9a1ba

Change-Id: I64411bd986c4f729840d7099291ff08a83429320
2017-05-09 22:49:02 +00:00
Steven Moreland 1e0a523d68 Merge "trusty*: Android.mk -> Android.bp"
am: e732d15337

Change-Id: Ie1e78fe387312f16aeee17d818999e9cc12d9ef9
2017-05-09 22:43:47 +00:00
Elliott Hughes f22da9a1ba Merge "Make fastboot command-line parsing a bit more like adb."
am: 0a253390d1

Change-Id: Ic9543862b6a6fd0d4ae70e5370890f6cc2e68b4c
2017-05-09 22:43:17 +00:00
Treehugger Robot e732d15337 Merge "trusty*: Android.mk -> Android.bp" 2017-05-09 22:32:49 +00:00
Elliott Hughes 0a253390d1 Merge "Make fastboot command-line parsing a bit more like adb." 2017-05-09 22:15:24 +00:00
Josh Gao 01b7bc43e9 adb: move all cleanup to a function with defined ordering.
We want to explicitly define the order in which we teardown adb, so
move all of the at_quick_exits sprinkled throughout into one function
containing all of the cleanup functions.

Bug: http://b/37104408
Test: adb kill-server; adb start-server
Change-Id: I394f5782eb147e394d4b87df1ba364c061de4b90
2017-05-09 14:32:47 -07:00
Josh Gao b3c14ec693 adb: make `adb kill-server` wait for the server to die.
Make the host:kill service shutdown its socket on process exit, instead
of immediately. Also, unify the two 'kill-server' implementations and
hide _adb_connect.

Bug: http://b/37104408
Test: adb kill-server; adb start-server
Change-Id: I9475f5d084d5fb91d33e393f2fd4e34056613384
2017-05-09 14:31:15 -07:00
Josh Gao 707a6e469f adb: libusb: replace sleep with timed CV wait.
Instead of sleeping for 500ms at the end of every device poll loop, use
a timed condition variable wait so that we can tell the device poll
thread to immediately commit suicide.

Bug: http://b/37869663
Test: adb kill-server; adb start-server
Change-Id: I597071866f7d9ef91900411727345d32c1a97556
2017-05-09 14:30:13 -07:00
Tom Cherry 795b3296ed Merge changes I172acf0f,I97b6e17a am: 4963b42d7b am: 09b0da7b10
am: 7c0f21074e

Change-Id: I5c261b9cd4ac7a3e4f10b7c39af057d93f3c74c1
2017-05-09 18:49:39 +00:00
Tom Cherry 7c0f21074e Merge changes I172acf0f,I97b6e17a am: 4963b42d7b
am: 09b0da7b10

Change-Id: I8edeebf3761089176b64cee64c1b74b29756d7e2
2017-05-09 18:39:34 +00:00
Tom Cherry 09b0da7b10 Merge changes I172acf0f,I97b6e17a
am: 4963b42d7b

Change-Id: I74baaa084cc8a72894eaf9bb7fcdf0e20af45be1
2017-05-09 18:20:16 +00:00
Tom Cherry 4963b42d7b Merge changes I172acf0f,I97b6e17a
* changes:
  init: change kill order and fix error reporting in KillProcessGroup()
  Better logging in libprocessgroup and make resources clean up themselves
2017-05-09 17:45:48 +00:00
Tom Cherry 872acd734f Merge "init: remove restorecon() from util.cpp" am: 035b0c26e6 am: c2a9136c51
am: 6ac577230b  -s ours

Change-Id: I328600a2c439ecf1a7d482c4eb04a2ca07519322
2017-05-09 17:23:42 +00:00