Commit graph

25695 commits

Author SHA1 Message Date
Mark Salyzyn
8a0531fe92 Merge changes I0c25e038,I33a8fb4e,I2c9cbbbd,If4c9711e,I4b00c0df, ... am: 07607c04ff am: e2af341f50
am: a73f9fab1b

Change-Id: I6bfef6c616c5cd3a2b3cacf9cf9aea64eba46c0d
2016-09-30 22:18:47 +00:00
Mark Salyzyn
3adbc9e7f3 liblog: Move liblog tag from 1005 to 1006 am: 9633b919d7 am: 4fd110d878
am: f1d6ffabac

Change-Id: Ib7d8bb725394f7ac6970b4869bb5043a306bbbe7
2016-09-30 22:18:32 +00:00
Mark Salyzyn
9f6b98dec0 system/core Replace log/log.h with android/log.h am: ff2dcd9af9 am: cac331afd9
am: 0308b0eabd

Change-Id: I4d631d53b4fc27e1a02d412bae21fffad6635258
2016-09-30 22:18:18 +00:00
Mark Salyzyn
0abff8fc61 system/core Replace cutils/log.h with android/log.h am: 66ce3e08c5 am: eb189f147b
am: 16f7786032

Change-Id: I26939d55686b6182c9fae5fc74f3e7ed92132cdb
2016-09-30 22:18:03 +00:00
Mark Salyzyn
c0a92b4a94 logd: logcat: Replace log/log.h with android/log.h am: 0dd4431072 am: 0f76f04072
am: a8d0a46956

Change-Id: I7c43316eef4ae12e666ea6a0126a38ac571dd41e
2016-09-30 22:17:47 +00:00
Mark Salyzyn
9bb1f2f915 libcutils: Replace cutils/log.h with android/log.h am: 23ed4c242a am: f56fce0240
am: 9fd2eaf827

Change-Id: If01fd686fc15aaf74b6f06b7e661eb46e127d51b
2016-09-30 22:17:30 +00:00
Mark Salyzyn
2156aae1d5 liblog: Replace log/log.h with android/log.h am: 6584d0a35a am: 499a33d6dc
am: c528ac0fe8

Change-Id: I2e6eb5782ccd27e47e8302381d790611fd58a1d7
2016-09-30 22:17:20 +00:00
Mark Salyzyn
ea3c6d1029 liblog: logcat: Replace log/logd.h with log/log.h am: a166708d15 am: 772ed1c63c
am: 2b42b87d8c

Change-Id: I4a977e248d0ea7e3b8ed31aed0643752aaab4e1c
2016-09-30 22:17:14 +00:00
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
a73f9fab1b Merge changes I0c25e038,I33a8fb4e,I2c9cbbbd,If4c9711e,I4b00c0df, ... am: 07607c04ff
am: e2af341f50

Change-Id: Idc6826ee5b5d51375a84f8c2297b25dcb2098c64
2016-09-30 22:13:12 +00:00
Mark Salyzyn
f1d6ffabac liblog: Move liblog tag from 1005 to 1006 am: 9633b919d7
am: 4fd110d878

Change-Id: Iee4cb5c19442090a9dde6550c3994b9f1e97f1a2
2016-09-30 22:13:06 +00:00
Mark Salyzyn
0308b0eabd system/core Replace log/log.h with android/log.h am: ff2dcd9af9
am: cac331afd9

Change-Id: I95c6a64bc35a041688303fcee4d506865d0a19a4
2016-09-30 22:13:00 +00:00
Mark Salyzyn
16f7786032 system/core Replace cutils/log.h with android/log.h am: 66ce3e08c5
am: eb189f147b

Change-Id: I3f2b13e259d9bbb7bc714f21eab7181fa72c35bf
2016-09-30 22:12:55 +00:00
Mark Salyzyn
a8d0a46956 logd: logcat: Replace log/log.h with android/log.h am: 0dd4431072
am: 0f76f04072

Change-Id: I3eef766f72fa363097556d90962c6f42fc49e3ea
2016-09-30 22:12:50 +00:00
Mark Salyzyn
9fd2eaf827 libcutils: Replace cutils/log.h with android/log.h am: 23ed4c242a
am: f56fce0240

Change-Id: I588c3a252594e1ecd4b34242217cf23c84e4af67
2016-09-30 22:12:45 +00:00
Mark Salyzyn
c528ac0fe8 liblog: Replace log/log.h with android/log.h am: 6584d0a35a
am: 499a33d6dc

Change-Id: If28b70b199b4bbf99f853d6c6d14b73a72fafacb
2016-09-30 22:12:41 +00:00
Mark Salyzyn
2b42b87d8c liblog: logcat: Replace log/logd.h with log/log.h am: a166708d15
am: 772ed1c63c

Change-Id: Ibd14ac6a57994019e188e6ec138682b50d1f7e69
2016-09-30 22:12:36 +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
e2af341f50 Merge changes I0c25e038,I33a8fb4e,I2c9cbbbd,If4c9711e,I4b00c0df, ...
am: 07607c04ff

Change-Id: I12580455d83141f471c91439f18c79c17b088ef2
2016-09-30 22:09:34 +00:00
Mark Salyzyn
4fd110d878 liblog: Move liblog tag from 1005 to 1006
am: 9633b919d7

Change-Id: I907f5c896add0089c78fa6650e61bae76a6cc1c3
2016-09-30 22:09:33 +00:00
Mark Salyzyn
cac331afd9 system/core Replace log/log.h with android/log.h
am: ff2dcd9af9

Change-Id: I3c47cb42639d56740ecf7e4fe61ea49982d69fed
2016-09-30 22:09:28 +00:00
Mark Salyzyn
eb189f147b system/core Replace cutils/log.h with android/log.h
am: 66ce3e08c5

Change-Id: I20b6def8ee10f2017776024bb647deea0e073683
2016-09-30 22:09:24 +00:00
Mark Salyzyn
0f76f04072 logd: logcat: Replace log/log.h with android/log.h
am: 0dd4431072

Change-Id: Icf472fa10213cd51f9ae05b22d982439a109d172
2016-09-30 22:09:20 +00:00
Mark Salyzyn
f56fce0240 libcutils: Replace cutils/log.h with android/log.h
am: 23ed4c242a

Change-Id: I03d1255d16302a6220c97bac703df820cdf4cc44
2016-09-30 22:09:15 +00:00
Mark Salyzyn
499a33d6dc liblog: Replace log/log.h with android/log.h
am: 6584d0a35a

Change-Id: I01e33a07cec32e47653f142f4d4cbb88371d9494
2016-09-30 22:09:11 +00:00
Mark Salyzyn
772ed1c63c liblog: logcat: Replace log/logd.h with log/log.h
am: a166708d15

Change-Id: Id807e2f86ec16ef5b5326f1c27e49feaca5135e1
2016-09-30 22:09:06 +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
07607c04ff Merge changes I0c25e038,I33a8fb4e,I2c9cbbbd,If4c9711e,I4b00c0df, ...
* changes:
  liblog: Move liblog tag from 1005 to 1006
  system/core Replace log/log.h with android/log.h
  system/core Replace cutils/log.h with android/log.h
  logd: logcat: Replace log/log.h with android/log.h
  libcutils: Replace cutils/log.h with android/log.h
  liblog: Replace log/log.h with android/log.h
  liblog: logcat: Replace log/logd.h with log/log.h
  liblog: logd: logcat: deprecate log/log_read.h
  liblog: Add C++ wrapper for C event log handler
2016-09-30 22:05:17 +00:00
Mark Salyzyn
9633b919d7 liblog: Move liblog tag from 1005 to 1006
Allow logd to add another "consecutive" log tag

Test: gTest liblog-unit-tests, check for liblog in logcat afterwards
Bug: 31456426
Change-Id: I0c25e038878ec9a0cf368a33a63f8345c68749c3
2016-09-30 12:47:05 -07:00
Mark Salyzyn
ff2dcd9af9 system/core Replace log/log.h with android/log.h
Should use android/log.h instead of log/log.h as a good example
to all others.  Adjust header order to comply with Android Coding
standards.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I33a8fb4e754d2dc4754d335660c450e0a67190fc
2016-09-30 12:47:05 -07:00
Mark Salyzyn
66ce3e08c5 system/core Replace cutils/log.h with android/log.h
Should use android/log.h instead of cutils/log.h as a good example
to all others.  Adjust header order to comply with Android Coding
standards.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I2c9cbbbd64d8dccf2d44356361d9742e4a9b9031
2016-09-30 12:47:05 -07:00
Mark Salyzyn
0dd4431072 logd: logcat: Replace log/log.h with android/log.h
Should use android/log.h instead of log/log.h as a good example
to all others.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: If4c9711eb57267d4707b03d54a932af9de241b13
2016-09-30 12:47:05 -07:00
Mark Salyzyn
23ed4c242a libcutils: Replace cutils/log.h with android/log.h
Replace references to cutils/log.h and log/log.h with android/log.h.
Point cutils/log.h to android/log.h. Adjust header order to comply
with Android Coding standards.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I4b00c0dff3a0a50cbb54301fdc5a6c29c21dab65
2016-09-30 12:47:05 -07:00
Mark Salyzyn
6584d0a35a liblog: Replace log/log.h with android/log.h
Move all liblog related content into android/log.h, and make
log/log.h points to android/log.h.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I858e0ebe047b86f2a8530a99bc9c380d3d58edbb
2016-09-30 12:47:05 -07:00
Mark Salyzyn
a166708d15 liblog: logcat: Replace log/logd.h with log/log.h
Should use log/log.h and in some cases android/log.h instead. Can
not remove file because still in use by partners, so log/logd.h
points to log/log.h.

Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I3580d46154617abb7231027a44f4ab9ee023febf
2016-09-30 12:47:05 -07: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