Commit graph

24738 commits

Author SHA1 Message Date
John Reck
7e86b688cb Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" am: b02a355d10
am: 8e7fa9fb7e

Change-Id: Ia5387836b2f07edff773dbe700e93552f3eed85b
2016-10-07 16:41:57 +00:00
John Reck
8e7fa9fb7e Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
am: b02a355d10

Change-Id: I0d520bbf002a317784ff8bb2963676a98df36706
2016-10-07 16:38:02 +00:00
John Reck
b02a355d10 Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" 2016-10-07 16:32:38 +00:00
John Reck
6a452917b3 Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
This reverts commit 595c1480d0.

Revert reason: broke bullhead-eng build in master

Change-Id: Ie64fc31c3c971366ab9f2543b91b8f5d2040868b
2016-10-07 16:22:38 +00:00
Tianjie Xu
206150bf78 Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4 am: f0ce69815f
am: 6fb68bb196

Change-Id: Id8f75debfae94d35dbbee9799632cba3f72648d0
2016-10-07 00:30:02 +00:00
Tianjie Xu
6fb68bb196 Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55 am: 680c3f1dc4
am: f0ce69815f

Change-Id: I8e69df083b6d5cd3a7e6bf7113ae836932c2e9f2
2016-10-07 00:26:31 +00:00
Tianjie Xu
f0ce69815f Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76 am: 398adf9b55
am: 680c3f1dc4

Change-Id: Ibd3e65922bb05b1247018d6dc89d3f79cf0eedd2
2016-10-07 00:23:01 +00:00
Tianjie Xu
680c3f1dc4 Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224 am: 167562aa76
am: 398adf9b55

Change-Id: If29777acccff5966a66e427e5baaeb536e161aaa
2016-10-07 00:19:30 +00:00
Tianjie Xu
398adf9b55 Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654 am: 8788591224
am: 167562aa76

Change-Id: Icb066cdaf63d87324c6eca8b5b45dbc23235aaa2
2016-10-07 00:15:00 +00:00
Tianjie Xu
167562aa76 Fix out of bound access in libziparchive am: 1ee4892e66 am: c24dd97654
am: 8788591224

Change-Id: I2f0ca98c74f23b1125f29b1eaf810143a83754b4
2016-10-07 00:11:29 +00:00
Tianjie Xu
8788591224 Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654

Change-Id: Ifddcfb7e658156c22539e07915115f4b657925b1
2016-10-07 00:07:59 +00:00
Tianjie Xu
c24dd97654 Fix out of bound access in libziparchive
am: 1ee4892e66

Change-Id: I26b48df5a9d39933b90ac063172b4b4ae8428bfd
2016-10-07 00:04:29 +00:00
Josh Gao
58a5e5a50b Merge "adb: split up adb_auth.cpp." am: 4a8b178c97
am: 4546c8ac3d

Change-Id: Idb9ed3e21524893943ecd176d9abe6a1e3b5493b
2016-10-06 19:50:37 +00:00
Josh Gao
4546c8ac3d Merge "adb: split up adb_auth.cpp."
am: 4a8b178c97

Change-Id: I846a06ca04aad456c6659dd6db4c8d0666fc6707
2016-10-06 19:47:11 +00:00
Treehugger Robot
4a8b178c97 Merge "adb: split up adb_auth.cpp." 2016-10-06 19:37:31 +00:00
Josh Gao
3bd2879d8e adb: split up adb_auth.cpp.
All of the functions in adb_auth.cpp were used in only one of
adb/adbd. Split up them up into adb_auth_host.cpp and adbd_auth.cpp
respectively.

Bug: http://b/29273531
Test: built and flashed bullhead, adb still works
Change-Id: Ib610c5157522634cc273511175152f1306cc52a7
2016-10-06 12:36:26 -07:00
Dimitry Ivanov
54be582396 Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib""" am: 8949696d33
am: e89ec3c4e0

Change-Id: I06d155471668c4ad79089e52037f8502f56406ff
2016-10-06 14:24:02 +00:00
Mark Salyzyn
1f6e063e06 Merge "logd: report logging memory overhead" am: d3754ff696
am: 386630f4ce

Change-Id: Ia8841921f55a4618e2b1301b911daf780f0f7d56
2016-10-06 14:23:48 +00:00
Dimitry Ivanov
e89ec3c4e0 Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
am: 8949696d33

Change-Id: I8099e374eccda844384682256af8d802e3fa0aea
2016-10-06 14:23:25 +00:00
Treehugger Robot
8949696d33 Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib""" 2016-10-06 14:20:41 +00:00
Mark Salyzyn
386630f4ce Merge "logd: report logging memory overhead"
am: d3754ff696

Change-Id: I3e0f11864dab17cc70f0e68a9b69adf8f1edb9d2
2016-10-06 14:19:46 +00:00
Treehugger Robot
d3754ff696 Merge "logd: report logging memory overhead" 2016-10-06 14:15:48 +00:00
Dimitry Ivanov
595c1480d0 Revert "Revert "Remove liblog from libcutils as a whole static lib""
This reverts commit f93d732a45.

Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: Ib6e6c0a01296f0a01d98cbf1a9d2659883280d44
2016-10-06 12:47:07 +00:00
Tao Bao
9766909149 Merge "adb: Remove the obsolete include path to ext4_utils." am: 9f828a5383
am: a00020317e

Change-Id: I474494405de42c794af3160898a867e766c558b1
2016-10-06 06:26:25 +00:00
Tao Bao
a00020317e Merge "adb: Remove the obsolete include path to ext4_utils."
am: 9f828a5383

Change-Id: Ia833226376111a0ead4f0c5b5d79768a8b8dbeb2
2016-10-06 06:23:27 +00:00
Treehugger Robot
9f828a5383 Merge "adb: Remove the obsolete include path to ext4_utils." 2016-10-06 06:18:45 +00:00
Tao Bao
fee161d189 adb: Remove the obsolete include path to ext4_utils.
Since commit 8ad80763e4 has removed
'#include "ext4_sb.h"', there's no more reference to ext4_utils headers.

Test: `mmma system/core/adb`

Change-Id: I7ca1a6e91f1e0de84238c2a7facbebe9600a3d87
2016-10-05 18:06:03 -07:00
Mark Salyzyn
9af33ee78c logd: report logging memory overhead
On 64 bit system, calculates to roughly 80 bytes of metadata and
list overhead for each entry.

In unit test example, we report 3388987 bytes of logging data and
overhead total, showmap reports 4652K of dirty data. We still want
to account for the remainder (fragmentation, other sources of
internal allocations etc).

Test: see values and check math
Bug: 31942525
Change-Id: I75f3162ce691faf1ae5a5dec18939fea535ede7e
2016-10-05 15:32:40 -07:00
Andreas Gampe
6049a29703 Merge "Base: Hand complete log message to aborter" am: 0d762648d0
am: e082ce827d

Change-Id: I0705e17a8250791fa5a8af2af9ca2c93316aee6d
2016-10-05 20:03:46 +00:00
Andreas Gampe
e082ce827d Merge "Base: Hand complete log message to aborter"
am: 0d762648d0

Change-Id: I33dd453e91aa60f3d797d4bd2db53d9ac1599a0b
2016-10-05 20:00:46 +00:00
Treehugger Robot
0d762648d0 Merge "Base: Hand complete log message to aborter" 2016-10-05 19:53:25 +00:00
Elliott Hughes
04819403d6 Merge "Test for _WIN32 in instead of USE_MINGW." am: ec99158580
am: 2e7e065db9

Change-Id: I9c7bee42bf1d7522d4dd95b5bb8a925841f96624
2016-10-05 18:35:40 +00:00
Elliott Hughes
2e7e065db9 Merge "Test for _WIN32 in instead of USE_MINGW."
am: ec99158580

Change-Id: If3c40977dfa4853a7dc719a9c6904f530ccf3001
2016-10-05 18:33:11 +00:00
Treehugger Robot
ec99158580 Merge "Test for _WIN32 in instead of USE_MINGW." 2016-10-05 18:30:06 +00:00
Elliott Hughes
34a4f0b8c7 Test for _WIN32 in instead of USE_MINGW.
Bug: http://b/23392815
Test: builds
Change-Id: I7fce8de1f0e2314170cce456cd49346dcee9d134
2016-10-05 09:37:44 -07:00
Wei Wang
06515d3231 Merge "Modify log level for service and ueventd" am: 891d0ba904
am: 42335b04b4

Change-Id: I6da15c085defb6ac23224673f8eb37af0eb221bc
2016-10-05 04:39:46 +00:00
Wei Wang
42335b04b4 Merge "Modify log level for service and ueventd"
am: 891d0ba904

Change-Id: Ida9ac705e0f763deb731e3f6ed0ac84933294601
2016-10-05 04:37:47 +00:00
Treehugger Robot
891d0ba904 Merge "Modify log level for service and ueventd" 2016-10-05 04:34:42 +00:00
Andreas Gampe
b4e32f3b33 Base: Hand complete log message to aborter
Undo zero-termination-substitution for linebreaks when logging.
This results in handing the complete log message to the aborter.
Add a test.

Bug: 31893081
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: I2ef6c6351db2fd494a02985f634f439104136227
2016-10-04 19:19:59 -07:00
Wei Wang
a285dac9c0 Modify log level for service and ueventd
Bug: 31938558
Test: flash and take a boot log
Change-Id: I5c6823614e1df760128519dfb294f3a44efa6bac
2016-10-04 14:50:48 -07:00
Mark Salyzyn
6e5ffe2680 Merge "system/core: drop or replace log/logger.h" am: 1f90485804
am: cb670780be

Change-Id: I532a0f6143511f53f3303751f95de115ac034cd7
2016-10-04 18:33:44 +00:00
Mark Salyzyn
cb670780be Merge "system/core: drop or replace log/logger.h"
am: 1f90485804

Change-Id: I5b4f756c3a683f2d8e0ebdb79600d4e30bc26849
2016-10-04 18:32:14 +00:00
Mark Salyzyn
1f90485804 Merge "system/core: drop or replace log/logger.h" 2016-10-04 18:27:46 +00:00
Mark Salyzyn
37c9451349 system/core: drop or replace log/logger.h
debuggerd does not require log/logger.h, can use android/log.h
In some cases, mark why log/logger.h was required.

Test: Compile and boot smoke test
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: Ia34987e25a01d81971ec8d785415f732b8376c4f
2016-10-04 09:09:10 -07:00
Mohan Srinivasan
2acb41b46c Merge "liblog: logd: Add android_lookupEventTag_len()" am: 093951a230
am: aed39f1f3d

Change-Id: If1615c62df20df58eda2910455f2a1e05268fba7
2016-10-03 22:42:20 +00:00
Mohan Srinivasan
aed39f1f3d Merge "liblog: logd: Add android_lookupEventTag_len()"
am: 093951a230

Change-Id: I2e9a3c1132dc7cd6e22d55cc2983720f7b8510b9
2016-10-03 22:40:19 +00:00
Mohan Srinivasan
093951a230 Merge "liblog: logd: Add android_lookupEventTag_len()" 2016-10-03 22:34:15 +00:00
Dimitry Ivanov
1814d808f3 Merge "Revert "Remove liblog from libcutils as a whole static lib"" am: d4446ccce8
am: 3e5bb6dc6e

Change-Id: I6ec33c2aefa86f088701340b73205efab82a422d
2016-10-03 22:28:37 +00:00
Dimitry Ivanov
3e5bb6dc6e Merge "Revert "Remove liblog from libcutils as a whole static lib""
am: d4446ccce8

Change-Id: I6bd8c8756d0318ac5b78395bc3c6fdcee11d2ec0
2016-10-03 22:26:06 +00:00
Dimitry Ivanov
d4446ccce8 Merge "Revert "Remove liblog from libcutils as a whole static lib"" 2016-10-03 22:21:19 +00:00