Yabin Cui
b49b09a4b6
Merge "Fix libbacktrace host build." am: bfdc099650
...
am: 97790cfd37
* commit '97790cfd37a7cc866cb83c429f772d8edf21daee':
Fix libbacktrace host build.
2015-12-08 10:57:49 -08:00
Yabin Cui
97790cfd37
Merge "Fix libbacktrace host build."
...
am: bfdc099650
* commit 'bfdc099650b2adcb51d9b0c3a74dae5987b77ed1':
Fix libbacktrace host build.
2015-12-08 10:54:22 -08:00
Yabin Cui
bfdc099650
Merge "Fix libbacktrace host build."
2015-12-08 18:26:18 +00:00
David Pursell
9046c23ed6
Merge "adb: add help text for USB permission errors." am: 663e949b2b
am: e37325defc
...
am: 4542b62cca
* commit '4542b62ccafb749542bddaf0b442db554e7210e3':
adb: add help text for USB permission errors.
2015-12-08 16:22:44 +00:00
David Pursell
4542b62cca
Merge "adb: add help text for USB permission errors." am: 663e949b2b
...
am: e37325defc
* commit 'e37325defce9078a566b070c595d5c4dd933e35d':
adb: add help text for USB permission errors.
2015-12-08 16:19:19 +00:00
David Pursell
e37325defc
Merge "adb: add help text for USB permission errors."
...
am: 663e949b2b
* commit '663e949b2bbda5dcc2b92e4d1936555019cdd66b':
adb: add help text for USB permission errors.
2015-12-08 16:16:16 +00:00
Elliott Hughes
89d7caa5a7
Merge "Rename base/ to android-base/." am: 5986d9f263
am: a77731e14d
...
am: fbdec4f643
* commit 'fbdec4f6434e7040f410b99fb9a8e7d1f809e151':
Rename base/ to android-base/.
2015-12-08 16:12:24 +00:00
David Pursell
663e949b2b
Merge "adb: add help text for USB permission errors."
2015-12-08 16:12:22 +00:00
Elliott Hughes
fbdec4f643
Merge "Rename base/ to android-base/." am: 5986d9f263
...
am: a77731e14d
* commit 'a77731e14de614e26ddbf21daadba217c647be68':
Rename base/ to android-base/.
2015-12-08 16:09:26 +00:00
Elliott Hughes
a77731e14d
Merge "Rename base/ to android-base/."
...
am: 5986d9f263
* commit '5986d9f263d08ef8876656098cbe95b59d310f21':
Rename base/ to android-base/.
2015-12-08 16:06:06 +00:00
Elliott Hughes
5986d9f263
Merge "Rename base/ to android-base/."
2015-12-08 16:02:53 +00:00
Erik Kline
f3501658af
Merge "Listen on dualstack sockets." am: 1f7bcf3e93
am: f6df8fce6d
...
am: 4cb2c1fbb6
* commit '4cb2c1fbb60b5b4684bdd01c140eb82e1c397e3c':
Listen on dualstack sockets.
2015-12-08 06:38:12 +00:00
Erik Kline
4cb2c1fbb6
Merge "Listen on dualstack sockets." am: 1f7bcf3e93
...
am: f6df8fce6d
* commit 'f6df8fce6d0bea7da34e2e16edc691881b92105a':
Listen on dualstack sockets.
2015-12-07 22:35:10 -08:00
Erik Kline
f6df8fce6d
Merge "Listen on dualstack sockets."
...
am: 1f7bcf3e93
* commit '1f7bcf3e93349bbb067f12296c0e17cf64d30e89':
Listen on dualstack sockets.
2015-12-07 22:31:40 -08:00
Erik Kline
1f7bcf3e93
Merge "Listen on dualstack sockets."
2015-12-08 06:28:29 +00:00
Nick Kralevich
e042ff867c
Merge "adb: Make HOME=/data/local/tmp" am: 5358093225
am: 65ab87dd9b
...
am: b87df11678
* commit 'b87df11678c22d56d02c776f8f91031bf81a963d':
adb: Make HOME=/data/local/tmp
2015-12-08 05:06:19 +00:00
Nick Kralevich
b87df11678
Merge "adb: Make HOME=/data/local/tmp" am: 5358093225
...
am: 65ab87dd9b
* commit '65ab87dd9bc840e7bb187505824d2217ff1d8401':
adb: Make HOME=/data/local/tmp
2015-12-08 05:03:24 +00:00
Nick Kralevich
65ab87dd9b
Merge "adb: Make HOME=/data/local/tmp"
...
am: 5358093225
* commit '53580932250c9f3ba4a052c9fe31aa1de7bf411d':
adb: Make HOME=/data/local/tmp
2015-12-08 05:00:16 +00:00
Nick Kralevich
5358093225
Merge "adb: Make HOME=/data/local/tmp"
2015-12-08 04:56:05 +00:00
Nick Kralevich
c94d92f5ad
Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1
am: 070288241d
...
am: baaeddfa23
* commit 'baaeddfa239625a9d54091c628242d84a9191514':
init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:54:15 +00:00
Erik Kline
79a3210eda
Merge "Switch from using sockaddr to sockaddr_storage." am: 46b0b1c694
am: 4c1b3840f0
...
am: cbc6f68e32
* commit 'cbc6f68e320bd30d0cd7fbe73847deacbd54e073':
Switch from using sockaddr to sockaddr_storage.
2015-12-08 04:54:05 +00:00
Tom Cherry
b6058e4489
Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: c68998441c
am: c64de373c1
...
am: 876c9c803e
* commit '876c9c803e399877bf7b0adc52e7a6e18d055d73':
Remove ANDROID_PROPERTY_WORKSPACE
2015-12-08 04:53:59 +00:00
Mark Salyzyn
eb0137eeca
Merge "liblog: print message payload of zero length" am: 50413c7626
am: e13efa6112
...
am: 1f6a9473a7
* commit '1f6a9473a73371c2e7d8e28e1692c64e5a2efd0a':
liblog: print message payload of zero length
2015-12-08 04:53:54 +00:00
Dimitry Ivanov
d686fb3474
Merge "Native loader as a separate library" am: beceb6ef53
am: 17f119eade
...
am: d6c9995d99
* commit 'd6c9995d992b4fdffe176acff207f1f066e2a920':
Native loader as a separate library
2015-12-08 04:53:45 +00:00
Nick Kralevich
baaeddfa23
Merge "init.rc: restorecon_recursive /sys/kernel/debug" am: 6d85c06aa1
...
am: 070288241d
* commit '070288241d5c3d1a169e21ba4439a5943ce476d8':
init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:50:55 +00:00
Nick Kralevich
070288241d
Merge "init.rc: restorecon_recursive /sys/kernel/debug"
...
am: 6d85c06aa1
* commit '6d85c06aa1600e905cf3e0b093e939fa3866ee59':
init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:48:06 +00:00
Nick Kralevich
6d85c06aa1
Merge "init.rc: restorecon_recursive /sys/kernel/debug"
2015-12-08 04:44:08 +00:00
Yabin Cui
6405bb3aee
Fix libbacktrace host build.
...
On host build, libbacktrace relies on libcutils to provide gettid()
function.
Change-Id: Iad83384ea699ca024b71b73cef26755287c9e6fe
2015-12-07 20:09:24 -08:00
Erik Kline
cbc6f68e32
Merge "Switch from using sockaddr to sockaddr_storage." am: 46b0b1c694
...
am: 4c1b3840f0
* commit '4c1b3840f092e63b0b8db8998b3bbc3465ff7c91':
Switch from using sockaddr to sockaddr_storage.
2015-12-08 01:48:58 +00:00
Erik Kline
4c1b3840f0
Merge "Switch from using sockaddr to sockaddr_storage."
...
am: 46b0b1c694
* commit '46b0b1c694bd873bd8130440d9ec1367dbe6da6e':
Switch from using sockaddr to sockaddr_storage.
2015-12-07 17:45:17 -08:00
Erik Kline
46b0b1c694
Merge "Switch from using sockaddr to sockaddr_storage."
2015-12-08 01:41:38 +00:00
Tom Cherry
876c9c803e
Merge "Remove ANDROID_PROPERTY_WORKSPACE" am: c68998441c
...
am: c64de373c1
* commit 'c64de373c13183c424a2a27c34f45311328374d5':
Remove ANDROID_PROPERTY_WORKSPACE
2015-12-08 01:36:24 +00:00
Tom Cherry
c64de373c1
Merge "Remove ANDROID_PROPERTY_WORKSPACE"
...
am: c68998441c
* commit 'c68998441cdf32159912704fdd264b4750390012':
Remove ANDROID_PROPERTY_WORKSPACE
2015-12-08 01:33:10 +00:00
Tom Cherry
c68998441c
Merge "Remove ANDROID_PROPERTY_WORKSPACE"
2015-12-08 01:29:53 +00:00
Nick Kralevich
715c4dc3f9
init.rc: restorecon_recursive /sys/kernel/debug
...
If /sys/kernel/debug is present, make sure it has all the appropriate
SELinux labels.
Labeling of /sys/kernel/debug depends on kernel support
added in commit https://android-review.googlesource.com/122130
This patch depends on an external/sepolicy change with the
same Change-Id as this patch.
Change-Id: Id1d6a9ad6d0759d6de839458890e8cb24685db6d
2015-12-07 17:00:40 -08:00
Nick Kralevich
173eb396c7
adb: Make HOME=/data/local/tmp
...
Make the home directory for adb shell be /data/local/tmp and
automatically change into that directory.
Change-Id: Ib5cc6e1ecdd31a37e986cf03836f7589ebd40868
2015-12-07 16:56:12 -08:00
Mark Salyzyn
1f6a9473a7
Merge "liblog: print message payload of zero length" am: 50413c7626
...
am: e13efa6112
* commit 'e13efa61122cbad99dc10b9a89d1a06a6b6dc418':
liblog: print message payload of zero length
2015-12-08 00:39:06 +00:00
Mark Salyzyn
e13efa6112
Merge "liblog: print message payload of zero length"
...
am: 50413c7626
* commit '50413c7626c7598ccb062d7d1156e5cfa1b2cb8e':
liblog: print message payload of zero length
2015-12-08 00:31:59 +00:00
Mark Salyzyn
50413c7626
Merge "liblog: print message payload of zero length"
2015-12-08 00:27:30 +00:00
Mark Salyzyn
d7bcf40ee6
liblog: print message payload of zero length
...
logcat will crash if the log message payload is of zero length. Side
effect of possible log messages from LogKlog in eng and userdebug
builds, or lower level logging calls.
NB: The referenced bug cited an example of this native crash, this
does not fix the problem cited in the bug about the
com.android.music shutdown.
Bug: 25774695
Change-Id: I5c7a6ad8db640ba9bc8d34fab04ba7cc2a9a426a
2015-12-07 16:14:40 -08:00
Dimitry Ivanov
d6c9995d99
Merge "Native loader as a separate library" am: beceb6ef53
...
am: 17f119eade
* commit '17f119eadebc1a9b4d8236ad78df03844ca44044':
Native loader as a separate library
2015-12-08 00:06:24 +00:00
Mark Salyzyn
9d216130ad
Merge changes Ib441cecf,Ieb1bbe3d,I3e63e430,I531b4317,I8dd60545, ... am: d1379a8aed
am: 154e1c15ae
...
am: 850045ca27
* commit '850045ca27b2a71d6b1fee873dc7246edfd0b8f2':
logcat: Add --wrap timeout
logcat: Add low hanging fruit long arguments
logcat: Add long arguments to logcat, support for pid filter
liblog: Support for ANDROID_LOG_WRAP mode flag on reader
logd: test wakeup on wrap timeout
logd: wakeup on wrap or timeout
2015-12-08 00:04:01 +00:00
Mark Salyzyn
28309597a6
Merge "logd: test: leniency towards background cgroup" am: 3ea02e8eca
am: 660d17b25c
...
am: 93007fffe6
* commit '93007fffe6d9b46bae6354f92c7b7bc661d8fd87':
logd: test: leniency towards background cgroup
2015-12-08 00:02:16 +00:00
Mark Salyzyn
eb66cde79c
Merge "logd: test: statistics report chatty effective percentage" am: 2e2d2edc59
am: b62b7783ac
...
am: 2cfd261282
* commit '2cfd261282377222c3692451e3bae905d5d9ec8d':
logd: test: statistics report chatty effective percentage
2015-12-08 00:02:10 +00:00
Mark Salyzyn
db46d348be
Merge "liblog: test: liblog.android_logger_get_ failure" am: 8ca9a775f7
am: 28a96aeedc
...
am: 5d978db9dd
* commit '5d978db9dd2122247f8b3d9dbbcb8e40ea478292':
liblog: test: liblog.android_logger_get_ failure
2015-12-08 00:02:04 +00:00
Mark Salyzyn
e7b77665e3
Merge "logd: liblog: logcat: switch to android_log_clockid() (2)" am: 69504d646d
am: d2fb3e10ee
...
am: 42901fb07d
* commit '42901fb07d69b699fa07bdd25aca4957c3dd0c10':
logd: liblog: logcat: switch to android_log_clockid() (2)
2015-12-08 00:01:50 +00:00
Mark Salyzyn
e18f028637
Merge "Revert "logd: liblog: logcat: switch to android_log_clockid()"" am: b566435b02
am: a64dd2d0b4
...
am: b97aaca6b2
* commit 'b97aaca6b283573e5dd035d4cfd92fd5450ac96f':
Revert "logd: liblog: logcat: switch to android_log_clockid()"
2015-12-08 00:00:04 +00:00
Mark Salyzyn
48946e48e5
Merge "logd: liblog: logcat: switch to android_log_clockid()" am: 9eca0e775b
am: 8acc9bc1cb
...
am: 945bde67f3
* commit '945bde67f39f119d5c3b3136de4b7757f1adc7b6':
logd: liblog: logcat: switch to android_log_clockid()
2015-12-07 23:59:51 +00:00
Elliott Hughes
ef119a14b8
Merge "Track rename of base/ to android-base/." am: 912ed3d8ca
am: e2a9563be1
...
am: 3608ee5e90
* commit '3608ee5e903689ea7c433587be664649689816e1':
Track rename of base/ to android-base/.
2015-12-07 23:59:44 +00:00
Dimitry Ivanov
17f119eade
Merge "Native loader as a separate library"
...
am: beceb6ef53
* commit 'beceb6ef53b736879a962992c43fa318e3ea2999':
Native loader as a separate library
2015-12-07 23:58:01 +00:00