ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24586 commits 1 branch 0 tags 217 MiB
Commit graph

24586 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hung-ying Tyan
4e8a1a6895 resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 am: 2acf4a81dc 
am: 1e94e12312

Change-Id: I730e6337d5d224b60183dd020dd9098f769974e2
 2016-06-24 06:19:04 +00:00
Hung-ying Tyan
1e94e12312 resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 
am: 2acf4a81dc

Change-Id: Ib4dc107656666bc1036bcef920ed55c183a9f283
 2016-06-24 06:14:21 +00:00
Hung-ying Tyan
2acf4a81dc resolve merge conflicts of 66277db to stage-aosp-master 
am: 23a574a195

Change-Id: Id3e18ffa3a9e40755bd65bfbab79f79a7f8373a0
 2016-06-24 06:10:09 +00:00
Hung-ying Tyan
23a574a195 resolve merge conflicts of 66277db to stage-aosp-master 
Change-Id: I58b1f7fec779c707ac4048ae5401087ec4b7c8b0
 2016-06-24 13:21:09 +08:00
Hung-ying Tyan
66277db8d0 Merge "Add -f to insmod" 2016-06-24 04:34:56 +00:00
Jeffrey Vander Stoep
0015bd2c46 Merge \"Merge \\\\\\\"add a property for controlling perf_event_paranoid\\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 2ef8922c29\" into nyc-mr1-dev-plus-aosp 
am: 70fbe30c9a

Change-Id: I91c7828be978f644ba4bb2929ce93b5d617c846a
 2016-06-24 03:51:10 +00:00
Daniel Micay
e7eed8b498 Merge \\\\\\\"add a property for controlling perf_event_paranoid\\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 729722b3ea 
am: 4fdcc73b30

Change-Id: I75433832ff559903969066296b6cf1f44df7b021
 2016-06-24 03:51:09 +00:00
Android Build Merger (Role)
70fbe30c9a Merge "Merge \\\\\\"add a property for controlling perf_event_paranoid\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 2ef8922c29" into nyc-mr1-dev-plus-aosp 2016-06-24 03:47:45 +00:00
Jeffrey Vander Stoep
eec675458c Merge \\\\\\"add a property for controlling perf_event_paranoid\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 
am: 2ef8922c29

Change-Id: I5ec1eff0449579b33817f66d9eda0135c9b42dd6
 2016-06-24 03:47:33 +00:00
Jeffrey Vander Stoep
4fdcc73b30 Merge \\\\\\"add a property for controlling perf_event_paranoid\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 
am: 729722b3ea

Change-Id: Idf427e1fdb3aea48485f6b17ce872daa83be5c6c
 2016-06-24 03:47:32 +00:00
Daniel Micay
729722b3ea Merge \\\\\"add a property for controlling perf_event_paranoid\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc 
am: 34ae543dc3

Change-Id: I15e967dd17a52ea6dbc6d23e4d37ee95ff242e51
 2016-06-24 03:44:02 +00:00
Daniel Micay
2ef8922c29 Merge \\\\\"add a property for controlling perf_event_paranoid\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc 
am: 34ae543dc3

Change-Id: If297c19eca6c9a1623ca157c02114e4d9302039d
 2016-06-24 03:44:02 +00:00
Jeffrey Vander Stoep
34ae543dc3 Merge \\\\"add a property for controlling perf_event_paranoid\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 
am: 2d48c395cc

Change-Id: I678c109987a60bfc97b44ef4a48a4d658283ca66
 2016-06-24 03:41:19 +00:00
Hung-ying Tyan
bfa6d75c60 Add -f to insmod 
When the flag is on, insmod will bypass vermagic and symbol version
checking in the kernel. This is to make it possible to update kernel
without recompiling kernel modules.

BUG=28803994

Change-Id: Ib4be6999ef52baefd4210ee0d242360e43318907
 2016-06-24 11:10:46 +08:00
Andreas Gampe
6265780094 Rootdir: Add more asan.options support am: 8ccc1ad0f7 
am: e33c9e426b

Change-Id: Ia6a03d301832ec649976bc9889694a0b4203696f
 2016-06-24 00:50:29 +00:00
Andreas Gampe
e33c9e426b Rootdir: Add more asan.options support 
am: 8ccc1ad0f7

Change-Id: Ia72be83e461a3f09d6cd86fca99a89d9b6a71bb2
 2016-06-24 00:47:52 +00:00
Josh Gao
dd30f6b005 Merge \\\\"adb: refactor jdwp_service.cpp.\\\\" am: 71d11ade9d am: a4e35be4a4 am: 36e606236a 
am: e6dd5c7c88

Change-Id: I4dad711d64954010ab98d408fff1865971b42b94
 2016-06-23 23:42:09 +00:00
Josh Gao
e6dd5c7c88 Merge \\\"adb: refactor jdwp_service.cpp.\\\" am: 71d11ade9d am: a4e35be4a4 
am: 36e606236a

Change-Id: I9e8aa326adde3904881d08953dacb08809c2a727
 2016-06-23 23:39:43 +00:00
Josh Gao
36e606236a Merge \\"adb: refactor jdwp_service.cpp.\\" am: 71d11ade9d 
am: a4e35be4a4

Change-Id: I7bbc7c8b3df8cd2aa37bd41dfb53fda8b841cbb9
 2016-06-23 23:34:09 +00:00
Josh Gao
a4e35be4a4 Merge \"adb: refactor jdwp_service.cpp.\" 
am: 71d11ade9d

Change-Id: If7940e3a0b3a457d9be29dfb6c0707dbe8961397
 2016-06-23 23:31:38 +00:00
Josh Gao
d3a5a65d63 Merge \\\\"adb: add test for SIGHUP behavior.\\\\" am: a355dd6110 am: 05f889dd4e am: c0c57c43b2 
am: 80c5804fbd

Change-Id: I5e20b1bceafb7db27c15871b2735f86fe30342af
 2016-06-23 23:30:17 +00:00
Treehugger Robot
71d11ade9d Merge "adb: refactor jdwp_service.cpp." 2016-06-23 23:28:25 +00:00
Josh Gao
80c5804fbd Merge \\\"adb: add test for SIGHUP behavior.\\\" am: a355dd6110 am: 05f889dd4e 
am: c0c57c43b2

Change-Id: I69af6b72277b8acf3da853713fc9fc195941a33a
 2016-06-23 23:17:55 +00:00
Josh Gao
c0c57c43b2 Merge \\"adb: add test for SIGHUP behavior.\\" am: a355dd6110 
am: 05f889dd4e

Change-Id: I7ea1f3071fbf0f8a5dd83173c62566e08b3c2503
 2016-06-23 23:14:39 +00:00
Josh Gao
05f889dd4e Merge \"adb: add test for SIGHUP behavior.\" 
am: a355dd6110

Change-Id: Ib786fefd55a2a4533bf66dc1e47f88e398beb8e1
 2016-06-23 23:12:05 +00:00
Treehugger Robot
a355dd6110 Merge "adb: add test for SIGHUP behavior." 2016-06-23 23:09:06 +00:00
Josh Gao
fe50bb713b adb: add test for SIGHUP behavior. 
This keeps regressing, so add a test to keep this from happening.

Bug: http://b/23603716
Bug: http://b/25965770
Bug: http://b/29565233
Test: Ran test with/without commit cd5d737, fails before, passes after
Change-Id: I8c431e10fc76da5a9fd404dd70f17bb8a8df24e6
 2016-06-23 15:01:50 -07:00
Andreas Gampe
8ccc1ad0f7 Rootdir: Add more asan.options support 
Extend the asan.options file to read binary-specific configuration
from files out of /system. For early services, the system image
location is important as /data may not be available when they are
started.

Add a template that turns most sanitization off. At this point in
time, it is, however, impossible to get to a zero overhead state
after the fact. The template is meant to adapt a build after the
fact, and work around issues with LOCAL_SANITIZE := never.

Add a Make variable and rule copying the template to the path and
name expected by ASAN. Add SANITIZE_LITE to automatically add a
large set of options files.

Bug: 29498013
Change-Id: I8e9e6929a55cee3f3fa0acb377a886bfa7006c91
 2016-06-23 14:45:35 -07:00
Josh Gao
8d40ceaec0 Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 am: 3f8ad892ac 
am: 94746b03ea

Change-Id: I68395ad2399f35e876c63243e6ce4a8989669486
 2016-06-23 21:32:37 +00:00
Josh Gao
94746b03ea Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 am: 79a69f0bd7 
am: 3f8ad892ac

Change-Id: I419bfe31faf19f54bada9df387f17b9bd83ba491
 2016-06-23 21:30:30 +00:00
Josh Gao
3f8ad892ac Merge changes Ia59c6dbe,I13b17bcd am: 0b47d08303 
am: 79a69f0bd7

Change-Id: I902d0f4f7ba04e5b72361b591794a481f9c4059e
 2016-06-23 21:27:42 +00:00
Josh Gao
79a69f0bd7 Merge changes Ia59c6dbe,I13b17bcd 
am: 0b47d08303

Change-Id: Ica4c5de30e12f6950f0a9f3a2dc94213ef2fe70a
 2016-06-23 21:25:10 +00:00
Treehugger Robot
0b47d08303 Merge changes Ia59c6dbe,I13b17bcd 
* changes:
  adb: fix fd leak when shell fails to create a thread.
  adb: don't dup local socket fd.
 2016-06-23 21:22:54 +00:00
Daniel Micay
2d48c395cc Merge \\\"add a property for controlling perf_event_paranoid\\\" into mnc-dev am: 050243df76 am: f11efb251d 
am: 2a311a9b38

Change-Id: I6ea7f744704405be67cf3cfa175b4142b5255e05
 2016-06-23 21:10:41 +00:00
Jeffrey Vander Stoep
2a311a9b38 Merge \\"add a property for controlling perf_event_paranoid\\" into mnc-dev am: 050243df76 
am: f11efb251d

Change-Id: I1c641d19b4badfc9fef73d1a11675777f6d653d5
 2016-06-23 21:07:34 +00:00
Daniel Micay
f11efb251d Merge \"add a property for controlling perf_event_paranoid\" into mnc-dev 
am: 050243df76

Change-Id: Ifc1f319c5d81ed9f5735468d14d7a795b836f373
 2016-06-23 21:04:57 +00:00
Jeffrey Vander Stoep
050243df76 Merge "add a property for controlling perf_event_paranoid" into mnc-dev 2016-06-23 21:00:04 +00:00
Josh Gao
e31a7a4ce4 adb: fix fd leak when shell fails to create a thread. 
Bug: http://b/29565233
Change-Id: Ia59c6dbe5ac033425c11739579e85cbcad1170d1
 2016-06-23 13:14:49 -07:00
Josh Gao
cd5d7376dc adb: don't dup local socket fd. 
SIGHUP handling depends on the local socket fd being fully closed in
order to trigger an event on its counterpart. Release the local socket
fd inside of Subprocess when returning it to ensure this.

Functionally, a cherry-pick of internal commit 42afe20.

Bug: http://b/29565233
Change-Id: I13b17bcddf0b396a5f4880f9e410fbbf24d9370d
 2016-06-22 19:09:42 -07:00
Josh Gao
5aaca68433 adb: don\\\'t dup local socket fd. am: 42afe2033f -s ours am: 40f40d68ab 
am: b1cb4d91e1

Change-Id: I9d1c619c0c113ed67d01069eb7112c610d0c7ab6
 2016-06-23 01:43:09 +00:00
Josh Gao
db8214402b adb: don\\\'t dup local socket fd. am: 42afe2033f am: 22cbf62602 -s ours 
am: a6b6b987f9

Change-Id: I24bf77919b90f2e95cab1dd92b90e75be79a2589
 2016-06-23 01:43:09 +00:00
Josh Gao
b1cb4d91e1 adb: don\\'t dup local socket fd. am: 42afe2033f -s ours 
am: 40f40d68ab

Change-Id: I91db78fb1bb4eed250e1bba999787ec2ff64f703
 2016-06-23 01:35:19 +00:00
Josh Gao
40f40d68ab adb: don\'t dup local socket fd. 
am: 42afe2033f  -s ours

Change-Id: Ie2544493ccb25b48cc0f13602c5078fecbd6b7ef
 2016-06-23 01:32:18 +00:00
Josh Gao
a6b6b987f9 adb: don\\'t dup local socket fd. am: 42afe2033f 
am: 22cbf62602  -s ours

Change-Id: I88c9252fd67b1fa17e772fb169e437a976e47cfc
 2016-06-23 01:32:18 +00:00
Josh Gao
22cbf62602 adb: don\'t dup local socket fd. 
am: 42afe2033f

Change-Id: I4499180c294a79a12d7bcacbc3d41466037570f0
 2016-06-23 01:08:03 +00:00
Chih-Hung Hsieh
c1dda5dccd Merge \\\\"Fix misc-macro-parentheses warnings in system/core.\\\\" am: 495541c5bb am: 65828a0ec9 am: 4a8ab16746 
am: 3f646c24a9

Change-Id: I0131e74b001a9f1e56c456a52a327687e07b8955
 2016-06-22 23:18:07 +00:00
Chih-Hung Hsieh
3f646c24a9 Merge \\\"Fix misc-macro-parentheses warnings in system/core.\\\" am: 495541c5bb am: 65828a0ec9 
am: 4a8ab16746

Change-Id: I5ba2a6d0813eb728f5863801a36de6a012a8242a
 2016-06-22 23:05:59 +00:00
Josh Gao
42afe2033f adb: don't dup local socket fd. 
SIGHUP handling depends on the local socket fd being fully closed in
order to trigger an event on its counterpart. Release the local socket
fd inside of Subprocess when returning it to ensure this.

Bug: http://b/29565233
Change-Id: I13b17bcddf0b396a5f4880f9e410fbbf24d9370d
 2016-06-22 15:57:12 -07:00
Chih-Hung Hsieh
4a8ab16746 Merge \\"Fix misc-macro-parentheses warnings in system/core.\\" am: 495541c5bb 
am: 65828a0ec9

Change-Id: I7431484a0245468fba58ed587d3235125f35cf8e
 2016-06-22 22:45:28 +00:00
Chih-Hung Hsieh
65828a0ec9 Merge \"Fix misc-macro-parentheses warnings in system/core.\" 
am: 495541c5bb

Change-Id: I021b653779c5119398c31ee354372366ba029328
 2016-06-22 22:39:07 +00:00