Commit Graph

24215 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 fda0868744 Merge "Migrate liblog to ndk_library."
am: b98317ff1c

Change-Id: I660f4470e730d43d0a9896d3665cd40134c636d0
2016-09-27 20:43:36 +00:00
Josh Gao 279a1ea5b0 Merge "adb: fix IOKit handle leaks on OS X."
am: a2aff3f809

Change-Id: I24587b122c3d4d57eef137456c3628e4010d7b5c
2016-09-27 20:43:24 +00:00
Treehugger Robot b98317ff1c Merge "Migrate liblog to ndk_library." 2016-09-27 20:38:45 +00:00
Josh Gao a2aff3f809 Merge "adb: fix IOKit handle leaks on OS X." 2016-09-27 20:38:37 +00:00
Josh Gao b6a2f59515 adb: fix IOKit handle leaks on OS X.
Bug: https://code.google.com/p/android/issues/detail?id=219085
Test: Removed sleep in RunLoopThread, compared before/after this patch
Change-Id: Ia65bbedfb7d47bdb02bdfb69778784e5e855900b
2016-09-27 12:36:58 -07:00
Iliyan Malchev fe0d0be9a9 Merge changes from topic 'b/31458381'
am: 8d8545120c

Change-Id: If4de2dff5c3b4a253529f52a2c2af118147b1961
2016-09-27 00:10:32 +00:00
Iliyan Malchev ad0cbcf21c init.rc: have hwservicemanager start the HAL class
am: 57d66b8447

Change-Id: I8ee19e5f08c514bad1315d24546725203b41c13c
2016-09-27 00:08:22 +00:00