Tao Bao
95bcd98021
Merge "init: use libbootloader_message."
...
am: 5062b87eba
Change-Id: I413cc62aa7dbfba1950e187fdfa59a79c1048dc1
2016-10-18 22:54:28 +00:00
Tianjie Xu
b2ca85184b
Merge "Add functions in recovery/minzip to libziparchive"
...
am: 4bc51d1ea4
Change-Id: Ica94e8050286bed1c5bc23a33305050ab8da8ec5
2016-10-18 21:57:30 +00:00
Tao Bao
5062b87eba
Merge "init: use libbootloader_message."
2016-10-18 21:48:23 +00:00
Yabin Cui
1051e107f2
init: use libbootloader_message.
...
Bug: 29582118
Change-Id: I6285b29774a11d6dda8496c7c73e4c1d17a672bd
(cherry picked from commit 0b1252cca0 )
2016-10-18 11:37:52 -07:00
Tianjie Xu
4bc51d1ea4
Merge "Add functions in recovery/minzip to libziparchive"
2016-10-18 17:30:02 +00:00
Mark Salyzyn
84dafd104b
Merge changes Ibf4774f7,I6568eea0,I35e83679,I9faf8826,I8ee9d999
...
am: c1f74ca5aa
Change-Id: I2cbc465311cc5cab091086b0eb4f1c515af6f6cc
2016-10-18 16:46:20 +00:00
Mark Salyzyn
82ce1f1ff2
fs_mgr: use __android_log_is_debuggable()
...
am: e528be5e7d
Change-Id: I3dbe3e0f6e3076a24af3fd868907ad7e688517e5
2016-10-18 16:46:19 +00:00
Mark Salyzyn
8648bddf24
adb: use __android_log_is_debuggable()
...
am: 97787a00e6
Change-Id: I326735c9b0e6163ab5b2215a6bed44ea710409d2
2016-10-18 16:46:15 +00:00
Mark Salyzyn
400d85ab2a
debuggerd: use __android_log_is_debuggable()
...
am: dafe384207
Change-Id: Idba40e16ccc20f66c14aa294033d534212646fbf
2016-10-18 16:46:11 +00:00
Mark Salyzyn
f606721b59
logd: use __android_log_is_debuggable()
...
am: 5740a46e4e
Change-Id: Idddc3c174b152b90dca915f7bf0cef654b41be3d
2016-10-18 16:46:06 +00:00
Mark Salyzyn
f43c324ce1
libcutils: use __android_log_is_debuggable()
...
am: b5aa4e7125
Change-Id: Ifd6eafdcaf348fe64e88341cb5c511d28a390e15
2016-10-18 16:46:02 +00:00
Treehugger Robot
c1f74ca5aa
Merge changes Ibf4774f7,I6568eea0,I35e83679,I9faf8826,I8ee9d999
...
* changes:
fs_mgr: use __android_log_is_debuggable()
adb: use __android_log_is_debuggable()
debuggerd: use __android_log_is_debuggable()
logd: use __android_log_is_debuggable()
libcutils: use __android_log_is_debuggable()
2016-10-18 16:33:28 +00:00
Mark Salyzyn
3132543d83
Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()"
...
am: 915d620359
Change-Id: I66547a2d32c96b9baffccb8a391a15a155faf123
2016-10-17 21:57:22 +00:00
Treehugger Robot
915d620359
Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()"
2016-10-17 21:46:37 +00:00
Mark Salyzyn
07f2357b56
Merge "liblog: __android_log_pmsg_file_write() cleanup"
...
am: 6da1ea0e48
Change-Id: I795733c69d5dd4be515358900fee0cdb8d5e44b9
2016-10-17 14:22:51 +00:00
Treehugger Robot
6da1ea0e48
Merge "liblog: __android_log_pmsg_file_write() cleanup"
2016-10-17 14:16:46 +00:00
Tianjie Xu
18c25920c2
Add functions in recovery/minzip to libziparchive
...
Add two functions libziparchive that libminzip has. And create
corresponding unit tests.
1. Open a zip archive from a memory mapped region.
2. A new writer that takes a call back function pointer.
(Used by the OTA updater to stream the data.)
Test: Unit tests passed
Bug: 19472796
Change-Id: I2b2daec71174afe221030357e39bff5faea51e72
2016-10-15 23:16:34 -07:00
Dan Albert
bcad2a684e
Merge "Continue using the legacy NDK android/log.h."
...
am: 14a7725f26
Change-Id: Ie19bc50da9abde9f15860a49a19cbc4607b02ba2
2016-10-14 21:06:26 +00:00
Treehugger Robot
14a7725f26
Merge "Continue using the legacy NDK android/log.h."
2016-10-14 21:03:54 +00:00
Elliott Hughes
091113ec6c
Merge "Remove socket_loopback_client."
...
am: 5171bebf41
Change-Id: I28080f043ba5a042573e81a6da3f5be83c7a4251
2016-10-14 20:37:06 +00:00
Dan Albert
b7c3996f7c
Continue using the legacy NDK android/log.h.
...
system/core/android/log.h needs some work before it can be included in
the NDK. It defines a *lot* of macros that previously were usable
names in NDK sources that used android/log.h. As an example, the
following file defines LOG_TAG as a variable, but the variable name
gets macro replaced if we use the current android/log.h.
4adc1515f8/framework/platform/android/tcuTestLogParserJNI.cpp (41)
For now, we keep a copy of the old NDK android/log.h in
legacy-ndk-includes.
Test: make checkbuild
Bug: http://b/30465923
Change-Id: I8ce942d1ee2f8f0d4c27130802c03992a1b85ec4
2016-10-14 13:12:29 -07:00
Treehugger Robot
5171bebf41
Merge "Remove socket_loopback_client."
2016-10-14 18:21:38 +00:00
Mark Salyzyn
e528be5e7d
fs_mgr: use __android_log_is_debuggable()
...
Test: compile and boot smoke test
Bug: 27566046
Bug: 31456426
Change-Id: Ibf4774f742e5a5b7db75d17642ff483a4a0fc0c5
2016-10-14 11:12:24 -07:00
Mark Salyzyn
97787a00e6
adb: use __android_log_is_debuggable()
...
Test: compile and months of adb functionality use
Bug: 27566046
Bug: 31456426
Change-Id: I6568eea0eda8dc67dec2ba34cd4c3f56fb0ff0e9
2016-10-14 11:12:24 -07:00
Mark Salyzyn
dafe384207
debuggerd: use __android_log_is_debuggable()
...
Test: compile and signal 8 to some component
Bug: 27566046
Bug: 31456426
Change-Id: I35e83679fbc40d54217850521bff23d9306d86f8
2016-10-14 11:12:16 -07:00
Mark Salyzyn
5740a46e4e
logd: use __android_log_is_debuggable()
...
Test: gTest logd-unit-tests
Bug: 27566046
Bug: 31456426
Change-Id: I9faf88263fe62ce5bba80dc2cb928e6dbe73dbb2
2016-10-14 08:04:21 -07:00
Mark Salyzyn
b5aa4e7125
libcutils: use __android_log_is_debuggable()
...
Test: compile and boot smoke test
Bug: 27566046
Bug: 31456426
Change-Id: I8ee9d999a2e6a0336e45b6180ce6fd7975c113dc
2016-10-14 08:04:19 -07:00
Mark Salyzyn
9ea359fce0
liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()
...
Allow our own libraries to use this privately instead of
running the less efficient get_properties and doing the math.
Test: compile and boot smoke test
Bug: 27566046
Bug: 31456426
Change-Id: I2f677276d27fbcb6af01b600ac1d9891c8938d43
2016-10-14 08:00:41 -07:00
Elliott Hughes
19340be9fe
Merge "Rely on the platform -std default." am: 955648a915 am: 4594f50635
...
am: f1dffe0501
Change-Id: Ibbffb45d50ad038d55a4d435a250b59b64547227
2016-10-14 02:56:09 +00:00
Elliott Hughes
7948a33f2c
resolve merge conflicts of a4398c1 to stage-aosp-master am: 195669febc
...
am: b2ab1c43cb
Change-Id: I412943235ad6cd908aca04c56aa19a3d2bbb5413
2016-10-14 02:55:55 +00:00
Elliott Hughes
f1dffe0501
Merge "Rely on the platform -std default." am: 955648a915
...
am: 4594f50635
Change-Id: I459e76bcada6d849eccca73a470a910e335482bf
2016-10-14 02:47:44 +00:00
Elliott Hughes
b2ab1c43cb
resolve merge conflicts of a4398c1 to stage-aosp-master
...
am: 195669febc
Change-Id: I112dd568460f41829fd9c01d41234bc409f5cbcf
2016-10-14 02:47:32 +00:00
Elliott Hughes
4594f50635
Merge "Rely on the platform -std default."
...
am: 955648a915
Change-Id: Ic4e9a7fbc7d13cc18ebb84801bf2f2f9a1d04470
2016-10-14 02:45:03 +00:00
Treehugger Robot
955648a915
Merge "Rely on the platform -std default."
2016-10-14 02:28:38 +00:00
Elliott Hughes
195669febc
resolve merge conflicts of a4398c1 to stage-aosp-master
...
Change-Id: I550d5716bd5879f779d11509366090bf508731e4
2016-10-13 19:04:07 -07:00
Tao Wu
4b9774fe97
Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f am: 5b7c6772b0
...
am: 27c6c4cf04
Change-Id: I2ceb40b4589dfc2721197065ae5a85e9dc83b907
2016-10-14 01:51:54 +00:00
Elliott Hughes
a4398c1abe
Merge "Move off std::sto* function which abort on failure."
2016-10-14 01:51:10 +00:00
Tao Wu
27c6c4cf04
Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f
...
am: 5b7c6772b0
Change-Id: I63e945622d47ab1cbcbdd82d00cfdf3d51c95564
2016-10-14 01:46:26 +00:00
Tao Wu
5b7c6772b0
Merge "Fallback to IPv6 when IPv4 is not available in adb"
...
am: c32d7fd66f
Change-Id: I21efa80874bfffb88cc63098e0a402a3e8d1c122
2016-10-14 01:43:55 +00:00
Treehugger Robot
c32d7fd66f
Merge "Fallback to IPv6 when IPv4 is not available in adb"
2016-10-14 01:35:43 +00:00
Elliott Hughes
dd92a0a812
Remove socket_loopback_client.
...
Bug: http://b/31537253
Test: builds
Change-Id: If02c8107206fb60e4622f8937bee0d0a362e1c7d
2016-10-13 16:51:46 -07:00
Elliott Hughes
da46b392f1
Move off std::sto* function which abort on failure.
...
Bug: http://b/31403370
Test: builds, boots, libbase tests pass
Change-Id: I89cd7ca3d8f1c8a1bad0ddf3043439449d19a293
2016-10-13 15:34:05 -07:00
Chia-I Wu
7e671b343f
Merge "Add native_handle_init" am: d790aae4bc am: 28423b86fe
...
am: bf72cf21dc
Change-Id: I5d4cc013421350dd30fa13d168112d30ad93e7cd
2016-10-13 22:32:57 +00:00
Chia-I Wu
bf72cf21dc
Merge "Add native_handle_init" am: d790aae4bc
...
am: 28423b86fe
Change-Id: Ied7a062c6ce40864ea181819f5da21e64cae04de
2016-10-13 22:26:11 +00:00
Chia-I Wu
28423b86fe
Merge "Add native_handle_init"
...
am: d790aae4bc
Change-Id: I10cedea42c2c1ce0aedf53b57db56ce182e5961f
2016-10-13 22:24:12 +00:00
Chia-I Wu
d790aae4bc
Merge "Add native_handle_init"
2016-10-13 22:18:11 +00:00
Mark Salyzyn
db8a266aea
liblog: __android_log_pmsg_file_write() cleanup
...
__android_log_pmsg_file_write() will open /dev/pmsg0 if not
already, and will close it if we opened it.
Added atomic access to the android_log_context as insurance.
Fortify and correct pmsg tests.
Test: gTest liblog-unit-tests --gtest_filter=liblog.__android_log_pmsg_file_*
Bug: 31958686
Change-Id: I2cf6f971b6968938f471fda67367efe20dae3004
2016-10-13 21:43:42 +00:00
Christopher Ferris
afff774b42
Merge "Use process_vm_readv to read memory." am: bf0cf4e22d am: 8d7440e13c
...
am: 920011b64b
Change-Id: I995b62e3ddaeb95cc78a59ef34dd95398a620756
2016-10-13 17:40:24 +00:00
Christopher Ferris
920011b64b
Merge "Use process_vm_readv to read memory." am: bf0cf4e22d
...
am: 8d7440e13c
Change-Id: I6eacf5c70458dbdebf2a427d24085c21678cf3ed
2016-10-13 17:30:28 +00:00
Christopher Ferris
8d7440e13c
Merge "Use process_vm_readv to read memory."
...
am: bf0cf4e22d
Change-Id: I26ab63fa29f42d9f2402b360aeba6ef25987b7a5
2016-10-13 17:22:15 +00:00