Commit Graph

26791 Commits

Author SHA1 Message Date
Josh Gao 7149e3e72a Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143
am: ffcd14a9b9

Change-Id: I62537211751b865364bacaf8cf9c1d1596e76332
2016-11-17 23:57:54 +00:00
Josh Gao d1a9747589 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9
am: 6cac5c9815

Change-Id: Ie6f90d593cc9c5e3b89ba5734ca6719280f93a96
2016-11-17 23:57:40 +00:00
Josh Gao ffcd14a9b9 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f
am: 238a980143

Change-Id: I130be434938733fbc3f6ecb9c23f8cdaeac4dba4
2016-11-17 23:42:23 +00:00
Josh Gao 6cac5c9815 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7
am: 257ae8c6b9

Change-Id: I1c63c85cbe10393adbee26133d6bcdaa87fda3aa
2016-11-17 23:42:09 +00:00
Josh Gao 238a980143 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a
am: f69ff66c5f

Change-Id: I4f520495a4a286c00e221377926c02f3b91f4df1
2016-11-17 23:27:51 +00:00
Josh Gao 257ae8c6b9 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826
am: c80cd472c7

Change-Id: I7175252aa53b9f133c880537cc0003c3cdd6c6f5
2016-11-17 23:27:37 +00:00
Josh Gao f69ff66c5f Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd
am: 50dcfdf43a

Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153
2016-11-17 23:12:22 +00:00
Josh Gao c80cd472c7 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d
am: 08420b5826

Change-Id: I201b41b3fe33e7227c6d3335f5935acf18f9cfa9
2016-11-17 23:12:06 +00:00
Josh Gao 50dcfdf43a Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb
am: fa961006fd

Change-Id: I193387ccd84e4425070153a242ab320eb434b44b
2016-11-17 22:57:23 +00:00
Josh Gao 08420b5826 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765
am: d0b35e9e1d

Change-Id: Id4c832f6ff9728e305a513d24f4378576e00fe6d
2016-11-17 22:57:06 +00:00
Mark Salyzyn c8749d5108 logd: add EXIT command
Debugging aid. Allows us to run:

$ cat -n '<STUFF>\0EXIT\0' | nc -U /dev/socket/logd

and the pipeline will exit once done. Without the EXIT command
we will have to <CTRL+C> out to terminate the pipeline. This is
necessary since Android's netcat command does not support the -q
feature, and having the EXIT command is faster and cleaner anyways.

Test: manual as noted above.
Bug: 31456426
Change-Id: I65333358188db85e2eb1bb6a14deed1565826ac4
2016-11-17 14:42:33 -08:00
Josh Gao fa961006fd Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140
am: 7e21e1efeb

Change-Id: I8498b7981b8b63905a80200880d9b8d778ecfaf2
2016-11-17 22:42:18 +00:00
Josh Gao d0b35e9e1d adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours
am: 8621700765

Change-Id: I4cd639776fb19959b5b72302fcdb052c1d7a4786
2016-11-17 22:42:03 +00:00
Josh Gao 7e21e1efeb Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401
am: 8027acd140

Change-Id: I5e81317eefb5d19640506881d4b6717fd92932a4
2016-11-17 22:27:45 +00:00
Josh Gao 8621700765 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e
am: 0d5c1a7745  -s ours

Change-Id: Ic67f5e14491b6e685f898f4f8b7c15161cabb17a
2016-11-17 22:27:30 +00:00
Josh Gao 8027acd140 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea
am: 55d871c401

Change-Id: Ia6e73d6df06b49b3c2f9b83ac5d4c8c52917d25a
2016-11-17 22:00:10 +00:00
Josh Gao 0d5c1a7745 adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7
am: 1ceca95f8e

Change-Id: I1c8c386d69b3528a9be8f1b2c0032ed04363a228
2016-11-17 21:59:57 +00:00
Josh Gao 55d871c401 Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a
am: 0b4bd3feea

Change-Id: Ia706579c1d4f995956c91ffba7aa86e3da4e82d5
2016-11-17 21:51:38 +00:00
Josh Gao 1ceca95f8e adb: actually fix the windows build. am: 58eda35ace
am: bbd6d7b3e7

Change-Id: I0d2553e19b3e96e9af4e0aa3493a4b8b36e55431
2016-11-17 21:51:26 +00:00
Josh Gao 0b4bd3feea Merge "adb: actually fix the windows build." into klp-dev
am: da66b9100a

Change-Id: If9b3829707e7fc6d9846bc769108180e08d67b5f
2016-11-17 21:43:27 +00:00
Josh Gao bbd6d7b3e7 adb: actually fix the windows build.
am: 58eda35ace

Change-Id: If917d578acb8a0b289369f7b5b1aca7deff4a4b9
2016-11-17 21:43:26 +00:00
Josh Gao da66b9100a Merge "adb: actually fix the windows build." into klp-dev 2016-11-17 21:32:45 +00:00
Elliott Hughes cb132c07a5 Merge "Remove dead code." am: 3bde05d928 am: 8e5fb5a0e7
am: a5a65785ab

Change-Id: I946b58688421f0836a454542bc74882679a93b54
2016-11-17 20:54:23 +00:00
Elliott Hughes a5a65785ab Merge "Remove dead code." am: 3bde05d928
am: 8e5fb5a0e7

Change-Id: Icc3a59fc53d57ad4f60529e36b577bb8e38c7d49
2016-11-17 20:46:53 +00:00
Elliott Hughes 8e5fb5a0e7 Merge "Remove dead code."
am: 3bde05d928

Change-Id: Ib748fef3e54687c2da1818a7cd738f31e30b79ac
2016-11-17 20:39:22 +00:00
Treehugger Robot 3bde05d928 Merge "Remove dead code." 2016-11-17 20:29:10 +00:00
Wei Wang 4c3de75a28 Merge "init: move empty string check to InitTriggers" am: 9bf10ff61e am: 5514c50292
am: 934f465edb

Change-Id: Ie1af20f712ee546b2770907c478aa88e247f57ac
2016-11-17 19:45:20 +00:00
Wei Wang 934f465edb Merge "init: move empty string check to InitTriggers" am: 9bf10ff61e
am: 5514c50292

Change-Id: I4ef3ebe3fad3c9ef87c0f7e21955867d256b5816
2016-11-17 19:37:47 +00:00
Wei Wang 5514c50292 Merge "init: move empty string check to InitTriggers"
am: 9bf10ff61e

Change-Id: I7190f8bd86707b2adc4dbeffa0085ce3a190d680
2016-11-17 19:32:19 +00:00
Wei Wang 9bf10ff61e Merge "init: move empty string check to InitTriggers" 2016-11-17 19:21:47 +00:00
Elliott Hughes 284f07bd9d Remove dead code.
At this point, we can't write to oom_score_adj anyway.

Bug: https://code.google.com/p/android/issues/detail?id=227721
Test: boots, adb shell still works
Change-Id: I07e6ad32765f6582f316973547a3a3d552808287
2016-11-17 10:32:16 -08:00
Paul Lawrence e799e3317a Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34 am: ffa3689107
am: a99490c813

Change-Id: I7a43cf1beacd79fcd2b1efbae57d7b857a1920ed
2016-11-17 18:12:37 +00:00
Paul Lawrence a99490c813 Merge "Add flags to restorecon_recursive to traverse filesystems" am: 5fbd1cfd34
am: ffa3689107

Change-Id: Ib56202ae76ea431f60aba8135ec9c2762e79097e
2016-11-17 18:03:05 +00:00
Paul Lawrence ffa3689107 Merge "Add flags to restorecon_recursive to traverse filesystems"
am: 5fbd1cfd34

Change-Id: I539d7e9d441c7bb3f5602b892408a85436b857e8
2016-11-17 17:55:06 +00:00
Treehugger Robot 5fbd1cfd34 Merge "Add flags to restorecon_recursive to traverse filesystems" 2016-11-17 17:39:53 +00:00
Mark Salyzyn c43b02f2cb Merge "libcutils: sdk(mac) build error (part deux)" am: ed0a48c617 am: 5a411029de
am: 01f8f8c586

Change-Id: Ic41cc11458f9ae17815a9c35f57fd2d25c368e78
2016-11-17 17:00:10 +00:00
Mark Salyzyn 01f8f8c586 Merge "libcutils: sdk(mac) build error (part deux)" am: ed0a48c617
am: 5a411029de

Change-Id: I650a7c5bf614e30c2fe599891824d903695f5662
2016-11-17 16:51:36 +00:00
Mark Salyzyn 5a411029de Merge "libcutils: sdk(mac) build error (part deux)"
am: ed0a48c617

Change-Id: Id6d3a5568a3383111592fd097ab8c96568783522
2016-11-17 16:43:06 +00:00
Mark Salyzyn ed0a48c617 Merge "libcutils: sdk(mac) build error (part deux)" 2016-11-17 16:36:21 +00:00
Mark Salyzyn c03f3c7186 Merge "libcutils: sdk(mac) build error" am: 231d1ac640 am: 7bc8810a4a
am: 190e9cc65d

Change-Id: I701734f8f88593e603ca7539548240ba0760b864
2016-11-17 16:35:08 +00:00
Mark Salyzyn 0958b18da0 libcutils: sdk(mac) build error (part deux)
Test: Build
Bug: 32450474
Change-Id: I92cca30217715779a9db6a60e2e4831a20cec3d4
2016-11-17 08:33:26 -08:00
Mark Salyzyn 190e9cc65d Merge "libcutils: sdk(mac) build error" am: 231d1ac640
am: 7bc8810a4a

Change-Id: I018c34a0e70e448dc96805ba759921fa0a080c2f
2016-11-17 16:28:05 +00:00
Mark Salyzyn 7bc8810a4a Merge "libcutils: sdk(mac) build error"
am: 231d1ac640

Change-Id: Icca67be8194faa296b93e9bfec2a15002ac06147
2016-11-17 16:19:34 +00:00
Mark Salyzyn 231d1ac640 Merge "libcutils: sdk(mac) build error" 2016-11-17 16:09:33 +00:00
Mark Salyzyn 6b652160d1 libcutils: sdk(mac) build error
Surprise surprise, MAC sdk build has F_GETFD & not TEMP_FAILURE_RETRY.
Revert code to original form with the three alternatives for all OSii.

Test: Build
Bug: 32450474
Change-Id: Ia7361d8107675a620968d8395c5e2351ad364d29
2016-11-17 08:05:16 -08:00
Mark Salyzyn da30029d4f Merge "logcat: add hidden --debug flag and cleanup" am: c097c79b77 am: c8124d1592
am: 37573550fb

Change-Id: I8d249346fcd4459a81e5a2a8943b7223c7cb66bd
2016-11-17 15:48:54 +00:00
Mark Salyzyn 124b7cb732 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed am: 809dee506e
am: 26545e3c60

Change-Id: I4ab91b2e8d6e104f2d350f6bdaf743f772673bfa
2016-11-17 15:48:38 +00:00
Mark Salyzyn 37573550fb Merge "logcat: add hidden --debug flag and cleanup" am: c097c79b77
am: c8124d1592

Change-Id: I16b2e6b6c6cffcbe6b847997e0b9d579911c7e17
2016-11-17 15:41:20 +00:00
Mark Salyzyn 26545e3c60 Merge "libcutils: move cutils/files.h to cutils/android_get_control_file.h" am: 8c41e791ed
am: 809dee506e

Change-Id: I937ac8e0df7bd47f3db292f7acdc11c7946af868
2016-11-17 15:41:04 +00:00
Mark Salyzyn c8124d1592 Merge "logcat: add hidden --debug flag and cleanup"
am: c097c79b77

Change-Id: I50d28c3fc5f7ffbf1186ece2748e944bfdcf8a9f
2016-11-17 15:33:19 +00:00