Commit graph

35482 commits

Author SHA1 Message Date
Ryan Campbell
2c2595bfef Merge "Include asan options from data partition." am: 5d89e6c7fe am: 725fa57109
am: e817549d2a

Change-Id: Id77b2dd5847e391ef9db0a092ee9d4c4ecd09a2f
2017-08-10 01:19:30 +00:00
Ryan Campbell
e817549d2a Merge "Include asan options from data partition." am: 5d89e6c7fe
am: 725fa57109

Change-Id: I57eddf490a619c843770ed8ae278afdc81ab7d9d
2017-08-10 01:15:23 +00:00
Ryan Campbell
725fa57109 Merge "Include asan options from data partition."
am: 5d89e6c7fe

Change-Id: I22bfd9e46cd377b4532e1726522b8c9fdcdfeb04
2017-08-10 01:11:22 +00:00
Treehugger Robot
5d89e6c7fe Merge "Include asan options from data partition." 2017-08-10 01:05:44 +00:00
Christopher Ferris
c68f5b7004 Merge "Small clean ups" am: 5cd87d39d7 am: 188072f6a4
am: 22ea80bdcd

Change-Id: Ie85f29b7d807f2078cff7e5e2a14ce5d7dc64983
2017-08-09 23:32:44 +00:00
Mark Salyzyn
2dbdb62d09 Merge "logcat: transition to Android.bp" am: ad7f1bc0b3 am: b5a69e8e70
am: d544b318fb

Change-Id: I93f6add52dd6bdff30e8bc5709deded1b6e1ef14
2017-08-09 23:32:16 +00:00
Christopher Ferris
22ea80bdcd Merge "Small clean ups" am: 5cd87d39d7
am: 188072f6a4

Change-Id: Ifb47bd38f254e25820bf1bfb62a158ac7631b434
2017-08-09 23:29:08 +00:00
Mark Salyzyn
d544b318fb Merge "logcat: transition to Android.bp" am: ad7f1bc0b3
am: b5a69e8e70

Change-Id: Id11adfa25f4dd6d00c92bd411451b2d4cef3ca87
2017-08-09 23:28:44 +00:00
Christopher Ferris
188072f6a4 Merge "Small clean ups"
am: 5cd87d39d7

Change-Id: I4eea11359afef8c377c646e613733ddb4cc02776
2017-08-09 23:26:44 +00:00
Mark Salyzyn
b5a69e8e70 Merge "logcat: transition to Android.bp"
am: ad7f1bc0b3

Change-Id: I689b94aad609a4fd9734b159f305868eae5764ea
2017-08-09 23:26:24 +00:00
Christopher Ferris
5cd87d39d7 Merge "Small clean ups" 2017-08-09 23:22:22 +00:00
Mark Salyzyn
ad7f1bc0b3 Merge "logcat: transition to Android.bp" 2017-08-09 23:18:00 +00:00
Ryan Campbell
ce30d07b11 Include asan options from data partition.
Look for asan options under /data/asan so that multi-process coverage
can be enabled on a newly-started remote process without disabling
verity and without forcing it to be always-on.

Test: adb shell echo "include_if_exists=/data/asan/asan.options.%b" >>
/system/asan.options && adb shell echo
"coverage=1\ncoverage_dir=/data/misc/trace" >
/data/asan/asan.options.android.hardware.light@2.0-service && adb shell killall
android.hardware.light@2.0-service
Bug: 64019182

Change-Id: I241ad8478439323681dc1cfde2fa0770f030ae75
2017-08-09 15:32:23 -07:00
Christopher Ferris
3b4b075fea Small clean ups
- Remove redundant map_info checks.
- Initialize fde_count_ to zero.

Bug: 23762183

Contributed-By: Ivan Maidanski <i.maidanski@samsung.com>

Test: Builds, run backtrace_test modifying CreateNew to Create and vice-versa.
Change-Id: I6e9cdfa99734f8cc2d9915cc32c66a1455e79f1b
2017-08-09 14:22:12 -07:00
Mark Salyzyn
507f69f80e logcat: transition to Android.bp
Switch logcat, logcatd and liblogcat to use Android.bp.

Test: compile
Change-Id: I01c0d8cbc6a713ad5b4b413677574e3c6463afcb
2017-08-09 13:30:03 -07:00
Mark Salyzyn
d8dc9b66b9 Merge "logcat: fix error propagation." am: 2d1d8812cc am: 94984cf4bd
am: 8c05cd743e

Change-Id: I7d5e1a44c479f01f249398e1b44644edc4d64080
2017-08-09 01:09:02 +00:00
Mark Salyzyn
8c05cd743e Merge "logcat: fix error propagation." am: 2d1d8812cc
am: 94984cf4bd

Change-Id: I3e792200935470b0c75e70b9d0aa339ce8eb967d
2017-08-09 01:04:30 +00:00
Mark Salyzyn
94984cf4bd Merge "logcat: fix error propagation."
am: 2d1d8812cc

Change-Id: I0676572a6ff6e9591afb7f4e99cc64b92147dfef
2017-08-09 00:59:33 +00:00
Treehugger Robot
2d1d8812cc Merge "logcat: fix error propagation." 2017-08-09 00:45:20 +00:00
Tom Cherry
5cd97dcd2f Merge "ueventd: add test to ensure selabel_lookup() is thread safe" am: 2c3a2a8c5c am: 3df3ec34e4
am: 7fd1bc8fc3

Change-Id: Id053ade023074737b2096bb5061f2ad7798e40d6
2017-08-08 23:27:17 +00:00
Tom Cherry
7fd1bc8fc3 Merge "ueventd: add test to ensure selabel_lookup() is thread safe" am: 2c3a2a8c5c
am: 3df3ec34e4

Change-Id: I3c260731c56e903f53c20a0c52920f3ecfe3fe00
2017-08-08 23:04:04 +00:00
Mark Salyzyn
210e43c354 logcat: fix error propagation.
Fix some _serious_ error propagation issues discovered with
additional warning flags (-Wextra).

Test: compile
Change-Id: I5148550092e4ecb6cafba91229c350c516e7e244
2017-08-08 15:49:21 -07:00
Tom Cherry
3df3ec34e4 Merge "ueventd: add test to ensure selabel_lookup() is thread safe"
am: 2c3a2a8c5c

Change-Id: I57b1fb1906671950a4374f515438349f368f7cad
2017-08-08 22:48:04 +00:00
Tom Cherry
2c3a2a8c5c Merge "ueventd: add test to ensure selabel_lookup() is thread safe" 2017-08-08 22:00:26 +00:00
David Zeuthen
a46e979dc8 Merge "fastboot: Add --disable-verity and --disable-verification options." am: 24c39f0b4c am: 9ef86681a1
am: 6c22339cc9

Change-Id: Ib9f6662b8bb0c74c6752cf8e36647d1d976ddb96
2017-08-08 20:15:14 +00:00
Tom Cherry
57ef66b6fa ueventd: add test to ensure selabel_lookup() is thread safe
selabel_lookup() must be threadsafe, but had failed in the past.

Bug: 63861738
Test: this newly added test
Change-Id: I78bdb8e555433e8217ac6d4be112ba91de9f03bb
2017-08-08 13:11:44 -07:00
David Zeuthen
6c22339cc9 Merge "fastboot: Add --disable-verity and --disable-verification options." am: 24c39f0b4c
am: 9ef86681a1

Change-Id: If081fb15b7acc56f8b67be8427b9ad4805a02cbb
2017-08-08 20:11:09 +00:00
David Zeuthen
9ef86681a1 Merge "fastboot: Add --disable-verity and --disable-verification options."
am: 24c39f0b4c

Change-Id: I1fd796f55b15bd7a9f06b4a4f7c792565a117f86
2017-08-08 20:07:39 +00:00
Treehugger Robot
24c39f0b4c Merge "fastboot: Add --disable-verity and --disable-verification options." 2017-08-08 20:01:16 +00:00
Robert Quattlebaum
228123a5c8 Merge "Add AID for LoWPAN subsystem" am: f602dd4ced am: 4ff32084d5
am: 91f952dda0

Change-Id: I49a6c9c9db980910a0d2d9289ca1a123f21f3eed
2017-08-08 00:00:55 +00:00
Robert Quattlebaum
91f952dda0 Merge "Add AID for LoWPAN subsystem" am: f602dd4ced
am: 4ff32084d5

Change-Id: Ib4ff4c6eee71e1bf189e5cb945405cd679d77112
2017-08-07 23:56:49 +00:00
Robert Quattlebaum
4ff32084d5 Merge "Add AID for LoWPAN subsystem"
am: f602dd4ced

Change-Id: Idd091e64fd9cab58f38da67e0b32e0aa9c98fb7d
2017-08-07 23:55:19 +00:00
Treehugger Robot
f602dd4ced Merge "Add AID for LoWPAN subsystem" 2017-08-07 23:50:02 +00:00
David Zeuthen
b6ea435a20 fastboot: Add --disable-verity and --disable-verification options.
This can be used to disable verity and/or verification when flashing a
build to a device. It works with both 'fastboot flashall' and
'fastboot flash vbmeta /path/to/vbmeta.img'.

Bug: 62903976
Test: Manually tested.
Change-Id: Iad22d42a9dd5befd70ecd0224803721a10a28d90
2017-08-07 16:52:55 -04:00
Robert Quattlebaum
01f7576a3e Add AID for LoWPAN subsystem
Bug: b/64399805
Change-Id: Ida6aa60d8beee9151a723826d99c1e9044dc05be
2017-08-04 16:19:34 -07:00
Chih-hung Hsieh
36557667f3 Merge "Fix clang-tidy performance warnings in system/core." am: 69ff5009c7 am: 18f9c66823
am: b083ff4329

Change-Id: If5abdffbb78954d7fd1b2ae64827598d38d83c88
2017-08-04 21:26:37 +00:00
Chih-hung Hsieh
b083ff4329 Merge "Fix clang-tidy performance warnings in system/core." am: 69ff5009c7
am: 18f9c66823

Change-Id: Ica41ab22d44bd8d166b4a694c02b9b639a852777
2017-08-04 21:20:59 +00:00
Chih-hung Hsieh
18f9c66823 Merge "Fix clang-tidy performance warnings in system/core."
am: 69ff5009c7

Change-Id: I74373e9f0e7f83c9280f4700ea55b387c3384c2c
2017-08-04 21:14:30 +00:00
Chih-hung Hsieh
69ff5009c7 Merge "Fix clang-tidy performance warnings in system/core." 2017-08-04 21:05:51 +00:00
Tom Cherry
bb0c02c06e Merge "init: more unique_fd, less goto" am: 401c9cb330 am: 0908ca721a
am: 613fd13dc2

Change-Id: I83c87dd1f06b1a4246981e2b4d9eaf9a275569eb
2017-08-04 20:38:58 +00:00
Tom Cherry
613fd13dc2 Merge "init: more unique_fd, less goto" am: 401c9cb330
am: 0908ca721a

Change-Id: Iab85433cbe327daf6854444dc235adf31acd0925
2017-08-04 20:32:56 +00:00
Tom Cherry
0908ca721a Merge "init: more unique_fd, less goto"
am: 401c9cb330

Change-Id: If621924a00686b41889d4e75ad360c3c3d3d4a85
2017-08-04 20:26:57 +00:00
Tom Cherry
401c9cb330 Merge "init: more unique_fd, less goto" 2017-08-04 20:13:10 +00:00
Tom Cherry
7c4609cfb3 init: more unique_fd, less goto
Test: boot bullhead
Change-Id: I3c31ca045538d9c9dbbf9c8f27f63033344627fd
2017-08-04 20:12:56 +00:00
Jin Qian
410b39886f fastboot: add mke2fs and e2fsdroid to build package
am: c2ca105575

Change-Id: I19c6ae343d962aa3b6c87851c4b890dbb67b0c91
2017-08-04 16:18:42 +00:00
Jin Qian
5d487c5ee4 fastboot: call mke2fs to format ext4 filesystem on windows
am: 92064ef073

Change-Id: I4cb2952a645f80842ff4aaccc3960608a743e3d3
2017-08-04 16:18:25 +00:00
Jin Qian
abc99e2ccf fastboot: call mke2fs tools to generate ext4 image
am: ffef31cef1  -s ours

Change-Id: I3dca7579c09d7bc0aceb85fdcf70ec531a70ae27
2017-08-04 16:18:06 +00:00
Earl Ou
9435b3ed44 Merge "libcutils: write trace event into socket in container" am: 59b33cb01c am: 08d9cc3744
am: 6cc4df26d6

Change-Id: Ib4a23ef6f3644afe76e6615bdc1be0e4fd7f909c
2017-08-04 01:16:12 +00:00
Earl Ou
6cc4df26d6 Merge "libcutils: write trace event into socket in container" am: 59b33cb01c
am: 08d9cc3744

Change-Id: Ie6f05ca73b0391f6b739e43cf0920d5c52c0d882
2017-08-04 01:10:12 +00:00
Earl Ou
08d9cc3744 Merge "libcutils: write trace event into socket in container"
am: 59b33cb01c

Change-Id: Ie59769f5820a8bb5991ba3dca53df83c5e90f795
2017-08-04 01:04:15 +00:00