Commit graph

25663 commits

Author SHA1 Message Date
Mark Salyzyn
a06a6509d9 liblog: logd: logcat: deprecate log/log_read.h am: 004cd3c55d am: 78a459a8c8
am: 13c68b09d9

Change-Id: Icaab3eedecad8f55d8d1291b3414da5c12cec287
2016-09-30 22:17:08 +00:00
Mark Salyzyn
519bdbf0b4 liblog: Add C++ wrapper for C event log handler am: 8eaaac0103 am: 8b4cab3f69
am: 848da90978

Change-Id: I215d1da28c1d4e0377097f49493d1e9c5fc9ee75
2016-09-30 22:17:02 +00:00
Mark Salyzyn
13c68b09d9 liblog: logd: logcat: deprecate log/log_read.h am: 004cd3c55d
am: 78a459a8c8

Change-Id: If1a76043e7941191b3c6ba07ca0277b7f9b7f2e6
2016-09-30 22:12:32 +00:00
Mark Salyzyn
848da90978 liblog: Add C++ wrapper for C event log handler am: 8eaaac0103
am: 8b4cab3f69

Change-Id: I2760c8480818f30dd126e7cfbb900a0f5796c8b1
2016-09-30 22:12:28 +00:00
Mark Salyzyn
78a459a8c8 liblog: logd: logcat: deprecate log/log_read.h
am: 004cd3c55d

Change-Id: I5912a538e7ed2d423dee3c7fd287ba81d493e4e0
2016-09-30 22:09:02 +00:00
Mark Salyzyn
8b4cab3f69 liblog: Add C++ wrapper for C event log handler
am: 8eaaac0103

Change-Id: I2ddb79f9b166b7d7825cb139f95a14f08608c02d
2016-09-30 22:08:58 +00:00
Mark Salyzyn
004cd3c55d liblog: logd: logcat: deprecate log/log_read.h
Always used in combination with log/logger.h except in log_time.cpp,
and not used externally.  As a result liblog has to support stl, a
small price to pay since goal is to convert liblog to C++ internally.

Test: compile
Bug: 31456426
Bug: 26552300
Bug: 31289077
Change-Id: I72828ec807d0a2c8e40bbdebd7a69f147a7ca5a9
2016-09-30 12:47:05 -07:00
Mark Salyzyn
8eaaac0103 liblog: Add C++ wrapper for C event log handler
Add android_log_event_context class.

Test: in context of 'logd: add getEventTag command and service'
Bug: 31456426
Bug: 26552300
Bug: 31289077
Bug: 19235719
Change-Id: Icf918b443f01e04040c8d3efe0cdb7a8e70be10c
2016-09-30 12:47:05 -07:00
Miodrag Dinic
53be7eb3d0 Merge "[qemu]: Fix payload size format in qemu_pipe_frame_send()" am: e5976bea7a am: 8c274361fb
am: f610eaac14

Change-Id: I890fbb885044e82d4ec66a5a400240124003ac25
2016-09-30 18:00:16 +00:00
Miodrag Dinic
f610eaac14 Merge "[qemu]: Fix payload size format in qemu_pipe_frame_send()" am: e5976bea7a
am: 8c274361fb

Change-Id: I7c80343b0002ec68ef9cde40dad2202aa9b70c00
2016-09-30 17:49:11 +00:00
Miodrag Dinic
8c274361fb Merge "[qemu]: Fix payload size format in qemu_pipe_frame_send()"
am: e5976bea7a

Change-Id: Id13b05f017957749a5854e02e99ae8545f9846ee
2016-09-30 17:46:07 +00:00
Treehugger Robot
e5976bea7a Merge "[qemu]: Fix payload size format in qemu_pipe_frame_send()" 2016-09-30 17:39:48 +00:00
Elliott Hughes
a6d5587f78 resolve merge conflicts of b40756a to nyc-dev-plus-aosp
am: fe807214ef

Change-Id: Ibcfd7f5c9c67084c754b2b60ff1e9eed976e3249
2016-09-30 17:07:03 +00:00
Elliott Hughes
fe807214ef resolve merge conflicts of b40756a to nyc-dev-plus-aosp
Change-Id: Ic1aa6fd6ab66ca8fb7cf434a3d0679a41288e4a7
2016-09-30 10:00:02 -07:00
Elliott Hughes
b40756ac28 resolve merge conflicts of 50cb973 to stage-aosp-master
Change-Id: Idf0d02687cc47f64acfdd3da623c7a7a62043651
2016-09-30 09:08:23 -07:00
Elliott Hughes
50cb973b49 Merge "Improve "adb help" output." 2016-09-30 15:43:43 +00:00
Miodrag Dinic
192be1dcae [qemu]: Fix payload size format in qemu_pipe_frame_send()
The following change introduced regression for booting AOSP
on emulator for all architectures:

7c7990e Fix warnings in system/ headers

qemu_pipe expects payload size in the message header to be in hex format,
as stated in the comment for qemu_pipe_frame_send().

Change-Id: I32cfa9c9b2af56f93bbda0ea5597451c389ae45e
Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com>
2016-09-30 13:58:11 +02:00
Colin Cross
c910d0ac81 Merge "Update escaping in Android.bp files" am: 06460bf466 am: 0ea7c975af
am: 7d82c1291c

Change-Id: Ifba84db1d83c3214dd50ac4575c071d0cdbcc252
2016-09-30 04:26:46 +00:00
Colin Cross
7d82c1291c Merge "Update escaping in Android.bp files" am: 06460bf466
am: 0ea7c975af

Change-Id: Ifc79c77cc83d80fa135128f0283900c6b824fb20
2016-09-30 04:24:17 +00:00
Colin Cross
0ea7c975af Merge "Update escaping in Android.bp files"
am: 06460bf466

Change-Id: I0f828add8a11160b49866b5784d8615278d4e4a8
2016-09-30 04:21:31 +00:00
Treehugger Robot
06460bf466 Merge "Update escaping in Android.bp files" 2016-09-30 04:17:59 +00:00
Connor O'Brien
6d72798094 Merge "Add basic tests for ashmem" am: a2d4a6b598 am: 46d2e20ba6
am: 90ad05af85

Change-Id: Ia297292d33b626b8e0aaf87e32e206cd77558ebe
2016-09-29 22:17:41 +00:00
Connor O'Brien
90ad05af85 Merge "Add basic tests for ashmem" am: a2d4a6b598
am: 46d2e20ba6

Change-Id: Ib47512bc7f3a11481913768641d17ab88baf70c5
2016-09-29 21:55:04 +00:00
Connor O'Brien
46d2e20ba6 Merge "Add basic tests for ashmem"
am: a2d4a6b598

Change-Id: I73763ba19b7e05e5ea60d3bd6fd0bcdc140b8a39
2016-09-29 21:45:35 +00:00
Connor O'Brien
a2d4a6b598 Merge "Add basic tests for ashmem" 2016-09-29 21:32:02 +00:00
Colin Cross
af933290f6 Update escaping in Android.bp files
Strings like cflags in Android.bp files are parsed by blueprint,
written to build.ninja files, parsed by ninja, and then passed to
/bin/sh -c.  This had resulted in a combination of blueprint
(\"), ninja ($$), and shell (\$) escaping being necessary.

Soong has been updated to automatically handle ninja and shell
escaping, remove extra escaping from Android.bp files.

Bug: 31221587
Test: m -j
Change-Id: I78003c7a18028d27dff444af7d84901345d323a1
2016-09-29 14:07:08 -07:00
Colin Cross
0763c30289 Merge "Fix more system/core/include warnings" am: 18fbd80504 am: 5fe194a9fd
am: b5ca47989c

Change-Id: I8d5a602f94bc57866aa3827cc508c94afb4ac4ba
2016-09-29 17:58:08 +00:00
Colin Cross
b5ca47989c Merge "Fix more system/core/include warnings" am: 18fbd80504
am: 5fe194a9fd

Change-Id: I8e561ab27f93ed10efa8a0e864cd7d1283bb6163
2016-09-29 17:42:19 +00:00
Colin Cross
5fe194a9fd Merge "Fix more system/core/include warnings"
am: 18fbd80504

Change-Id: I9450a77271cdc42cc7db30461769ddb18f2e5af4
2016-09-29 17:32:30 +00:00
Colin Cross
18fbd80504 Merge "Fix more system/core/include warnings" 2016-09-29 17:20:30 +00:00
Elliott Hughes
e96fcf044f Merge "Use readdir instead of readdir_r." am: 833df5cd54 am: 16533c7c0b
am: 1456ddd921

Change-Id: I6ae0efe633ec257739a6af81a7cc19081e910ea3
2016-09-29 17:00:15 +00:00
Elliott Hughes
1456ddd921 Merge "Use readdir instead of readdir_r." am: 833df5cd54
am: 16533c7c0b

Change-Id: I51c20b23b0c36500720073036c2667f866888351
2016-09-29 16:48:15 +00:00
Elliott Hughes
16533c7c0b Merge "Use readdir instead of readdir_r."
am: 833df5cd54

Change-Id: Ie7de2a969ff5424bd28e3a5ce783266c2ec63bd0
2016-09-29 16:43:48 +00:00
Elliott Hughes
833df5cd54 Merge "Use readdir instead of readdir_r." 2016-09-29 16:38:45 +00:00
Elliott Hughes
4bf9bc1ac7 Improve "adb help" output.
The specific request was to document $ADB_VENDOR_KEYS, but since I'm here,
let's try to make the help output shorter but more useful...

Bug: http://b/18437888
Test: adb help
Change-Id: I77135d4e666f19524f880228d27d87ba881672b5
2016-09-28 15:29:19 -07:00
Elliott Hughes
9f206938ed Use readdir instead of readdir_r.
http://elliotth.blogspot.com/2012/10/how-not-to-use-readdirr3.html

Test: boots.
Change-Id: If75532e24fe4d17743bf8e8c9590156dee378a63
2016-09-28 14:04:12 -07:00
Mark Salyzyn
ae1612c54c Merge "liblog: fix errno issues with event tag map" am: dfd30c4a16 am: 930ff186ce
am: 71b38def04

Change-Id: I83de9e374a67946fde8191d63720b102690d468f
2016-09-28 18:21:01 +00:00
Mark Salyzyn
71b38def04 Merge "liblog: fix errno issues with event tag map" am: dfd30c4a16
am: 930ff186ce

Change-Id: Iac84f40e9e79063bee7f213eb21ff5f866462a32
2016-09-28 18:17:49 +00:00
Mark Salyzyn
930ff186ce Merge "liblog: fix errno issues with event tag map"
am: dfd30c4a16

Change-Id: Ic8db0058a3258d356f3732727a4628c013f76b4c
2016-09-28 18:14:48 +00:00
Treehugger Robot
dfd30c4a16 Merge "liblog: fix errno issues with event tag map" 2016-09-28 18:07:09 +00:00
David Pursell
5cab7cc637 Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215 am: 94c652ed31
am: dde69001c2

Change-Id: I869720698bb91b0e968c51740b916ab58ea89d5a
2016-09-28 17:46:46 +00:00
David Pursell
dde69001c2 Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215
am: 94c652ed31

Change-Id: I87e3bbc33077830ca95e06807cb9863f42b87bf4
2016-09-28 17:41:16 +00:00
David Pursell
94c652ed31 Merge "adb: fix host-side serial number parsing for IPv6."
am: b1c4d90215

Change-Id: I62454f520192df9b600280b59704e7c0fe55687f
2016-09-28 17:35:47 +00:00
Treehugger Robot
b1c4d90215 Merge "adb: fix host-side serial number parsing for IPv6." 2016-09-28 17:30:29 +00:00
Mark Salyzyn
4355c4e07a Merge "liblog: free event tag map in __android_log_close()" am: 1dfa8112ce am: 7d1c2ab2bc
am: 3c947ae165

Change-Id: I176468638240d13f17535aeff3274e1767494b46
2016-09-28 15:08:49 +00:00
Mark Salyzyn
3c947ae165 Merge "liblog: free event tag map in __android_log_close()" am: 1dfa8112ce
am: 7d1c2ab2bc

Change-Id: I916ec52fe782d52f0f3efc64f3349e589a8e4910
2016-09-28 15:05:35 +00:00
Mark Salyzyn
7d1c2ab2bc Merge "liblog: free event tag map in __android_log_close()"
am: 1dfa8112ce

Change-Id: I2b613be1642570b678dbb9d199b7287d6f9f6cc7
2016-09-28 15:02:36 +00:00
Treehugger Robot
1dfa8112ce Merge "liblog: free event tag map in __android_log_close()" 2016-09-28 14:58:39 +00:00
Colin Cross
1811d156e9 Fix more system/core/include warnings
The warnings in these files were hidden by -isystem
framework/native/include.

Bug: 31752268
Test: m -j
Change-Id: I2a54376aea380ee24e6483fb7d35fdfe8991c490
2016-09-27 16:21:12 -07:00
Dan Albert
34cce80473 Merge "Migrate liblog to ndk_library." am: b98317ff1c am: fda0868744
am: e93a7538af

Change-Id: I11d383b706fff6ea4c01b718a71e6a95cd4d3021
2016-09-27 20:52:40 +00:00