Josh Gao
87ef590bc1
Merge "libcrypto_utils: convert to Soong."
...
am: c1a9a21ffe
Change-Id: I9cf76646d4537750c4d4080234d3384fb307e610
2016-08-08 18:33:49 +00:00
Josh Gao
c1a9a21ffe
Merge "libcrypto_utils: convert to Soong."
2016-08-08 18:29:10 +00:00
Josh Gao
47763c3a09
libcrypto_utils: convert to Soong.
...
Bug: http://b/30708454
Change-Id: Iaad64272ced766f87e67f2877e990afccc558065
2016-08-05 18:07:36 -07:00
Elliott Hughes
e2a7eb17b5
Move init's kernel logging into libbase.
...
am: 7bc87a5a78
Change-Id: Ie5e359e8bd7dee4c0549072c7e955eeefe57d785
2016-08-05 00:30:00 +00:00
Elliott Hughes
7bc87a5a78
Move init's kernel logging into libbase.
...
This will let other stuff (such as adbd and recovery) use it too.
Bug: http://b/28467098
Change-Id: Idab51f438ed3edd6fe65a56c4b396eaff5f3833e
2016-08-04 16:09:39 -07:00
Elliott Hughes
963de55342
Merge "Have init kill the process group."
...
am: 9a5300fcb8
Change-Id: I692c5fabfaea39e7ed6c9de5f6ad245330e3442c
2016-08-02 23:10:29 +00:00
Elliott Hughes
1e73024653
Have init kill the process group.
...
killProcessGroup actually works on cgroups. Kill the POSIX process
group ourselves.
Bug: http://b/29751426
Change-Id: I1a2808488510f4262811b6407bcd0948ad23bc60
2016-08-02 14:20:40 -07:00
Chih-Hung Hsieh
4c4fa90462
Merge \"Fix clang-tidy performance warnings in syste/core.\"
...
am: 4efbce14b5
Change-Id: I84f6b0134fae6e9f40710f243f4825e3f31fa15f
2016-08-01 20:23:10 +00:00
Treehugger Robot
4efbce14b5
Merge "Fix clang-tidy performance warnings in syste/core."
2016-08-01 20:13:54 +00:00
Chih-Hung Hsieh
8f7b9e3d39
Fix clang-tidy performance warnings in syste/core.
...
* Use const reference type for parameters to avoid unnecessary copy.
* Suppress warning of not using faster overloaded string find function.
Bug: 30407689
Bug: 30411878
Change-Id: I6cfdbbd50cf5e8f3db6e5263076d3a17a9a791ee
Test: build with WITH_TIDY=1
Merged-In: Ie79dbe21899867bc62031f8618bb1322b8071525
2016-08-01 11:55:42 -07:00
Chih-Hung Hsieh
89cc78b77f
Merge \"Fix google-explicit-constructor warnings in system/core.\"
...
am: 6dc68cb5f9
Change-Id: I5a010465364b6e14423b19e8c0f9cffa58ee3152
2016-07-29 17:01:17 +00:00
Chih-hung Hsieh
6dc68cb5f9
Merge "Fix google-explicit-constructor warnings in system/core."
2016-07-29 16:57:17 +00:00
Dmitry Shmidt
2d5dfa89ae
Merge \"ueventd: Remove verbose restorecon_recursive: message\"
...
am: 345754313e
Change-Id: I8a65176acc859b59e96f22d39e095ce2d154d9cd
2016-07-28 22:19:18 +00:00
Dmitry Shmidt
7eed474db4
ueventd: Remove verbose restorecon_recursive: message
...
Bug: 30478300
Change-Id: Ife69bb5644c3f65f3a256dc042ae1c7fbfb77729
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-07-28 13:55:39 -07:00
Elliott Hughes
1cbd1f5016
Merge \"Fix early init logging.\"
...
am: 6d232ab4de
Change-Id: I437dd3b5243ca7854439c438093e94733579279e
2016-07-27 15:30:45 +00:00
Treehugger Robot
6d232ab4de
Merge "Fix early init logging."
2016-07-27 15:28:18 +00:00
Chih-Hung Hsieh
034c475931
Fix google-explicit-constructor warnings in system/core.
...
* Declare explicit conversion constructors.
* Add NOLINT for implicit conversion constructors.
* Fix also some misaligned indendations.
Bug: 28341362
Change-Id: Idf911f35923b408d92285cc1a053f382ba08c63e
Test: build with clang-tidy
2016-07-26 11:26:01 -07:00
Elliott Hughes
35f5d04620
Fix early init logging.
...
Remove the /dev/__kmsg__ workarounds (which can then be removed
from sepolicy), and fix confusion in the translation between
android-base logging and kernel logging priorities (in particular,
where 'notice' comes in the hierarchy).
Bug: http://b/30317429
Change-Id: I6eaf9919904b6b55bc402c20bf1a4ae269014bc7
Test: adb shell dmesg | grep init
2016-07-26 09:32:33 -07:00
Elliott Hughes
b49e54b1d7
Merge \"Improve init Service logging.\"
...
am: c1d9ac1f85
Change-Id: I5eca381c0883015f1d043946db71c20635cc1784
2016-07-26 15:21:38 +00:00
Elliott Hughes
e18e7e5c43
Improve init Service logging.
...
Say which service.
Don't ignore setpgid failures.
Change-Id: Ifa8eba583cc3cbf3d26763977bf8c3c9835271c6
2016-07-25 18:18:16 -07:00
Amit Pundir
91272bd435
Merge \"init: select usb gadget controller at run time\"
...
am: 916f5e873e
Change-Id: Ifc4ec86c56df0de1ca498f3de392405490690809
2016-07-15 22:53:21 +00:00
Amit Pundir
d2e74db475
init: select usb gadget controller at run time
...
Right now we set sys.usb.controller property in init.$platform.usb.rc
to enable ConfigFS gadgets.
Let system detect and set UDC driver name from /sys/class/udc instead.
Change-Id: I99ad49d24dc53b543c5573e209bf00d6c2d91dd4
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-07-15 15:01:43 -07:00
Jorge Lucangeli Obes
f2ffdac47a
Merge \"Refactor Service::Start method.\"
...
am: 82d2bcc21e
Change-Id: Icccd918f1dc02010c9aceb4560dc5ff18849d8a5
2016-07-11 17:13:26 +00:00
Treehugger Robot
82d2bcc21e
Merge "Refactor Service::Start method."
2016-07-11 17:08:45 +00:00
Jorge Lucangeli Obes
344d01f99f
Refactor Service::Start method.
...
This CL extracts code from Service::Start into four helper functions,
bringing Service::Start down to 134 lines vs 212 lines originally. This
makes the method a lot easier to follow. There is no change in behaviour.
Also, make error messages consistent (start with lowercase) and
format Service::Start to fit in 100 cols.
Bug: 30035168
Change-Id: If979976fba4d339a336d030f802ca9f169fd012c
2016-07-11 09:57:17 -04:00
Elliott Hughes
73d363bbc1
Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
...
am: 588b770063
Change-Id: I884276a8f8b8209f6e956c5fb410e8265184e1b5
2016-07-08 17:05:25 +00:00
Elliott Hughes
171a829c39
Make klog_fd thread-safe and make klog_init a no-op.
...
I'll come back and remove klog_init when I've removed other calls to it.
Change-Id: Iad7fd26d853b4ddc54e9abd44516b6f138cbbfcb
Test: booted N9, looked at "adb shell dmesg" output.
2016-06-29 16:16:41 -07:00
Jorge Lucangeli Obes
69e6dde7c6
Merge \"Rename \"Handle(r)\" to \"Parse(r)\" in Android init.\"
...
am: b0d062a497
Change-Id: If3b070c3ec8599e065980bec123bf8c2cf160222
2016-06-29 21:51:08 +00:00
Jorge Lucangeli Obes
177b27d4f5
Rename "Handle(r)" to "Parse(r)" in Android init.
...
The code in question parses config files, so use the right terminology.
Bug: 29872991
Change-Id: Id9644d9a98c1d702d2990f62b3020a27d073141e
2016-06-29 16:29:53 -04:00
Jorge Lucangeli Obes
5b951eebec
Merge \"init: Add option to run a service in a new PID/mount namespace.\"
...
am: e71cedf450
Change-Id: I963b61c06922ae017fdb27b4a3a99d6519505329
2016-06-29 20:29:07 +00:00
Jorge Lucangeli Obes
1b3fa3d650
init: Add option to run a service in a new PID/mount namespace.
...
Namespaces are a more consistent isolation primitive than e.g. hiding
/proc.
Bug: 29635190
Change-Id: I7c39975813fb13b3d06be35a24c0854f16549c0a
2016-06-29 14:49:11 -04:00
Elliott Hughes
7f5b29ff1e
resolve merge conflicts of 54c1219
to stage-aosp-master
...
Change-Id: I4b3b2a8690cfe147929fd096de380a9d4b79f1ec
2016-06-27 09:54:25 -07:00
Elliott Hughes
f86b5a6b90
Move init to libbase logging.
...
Change-Id: Ibfbefeff587a69e948978a037c555fd12a5ade6a
2016-06-27 08:11:31 -07:00
Elliott Hughes
80744d867f
Merge \"Remove MTD cruft from init.\"
...
am: 90db709a2f
Change-Id: I027708dd324000cbfad1a2a6e970f742db97bae5
2016-06-25 02:25:38 +00:00
Elliott Hughes
3195116e97
Remove MTD cruft from init.
...
Bug: http://b/29250988
Change-Id: I38ab263192944e4ff291fd91b25db163a8848d75
2016-06-24 18:26:30 -07:00
Elliott Hughes
e9a7f52ce5
Merge \"Remove more obsolete MTD stuff.\"
...
am: aa9f37185f
Change-Id: I7952147c2115d1e205737277376726507aed8447
2016-06-24 17:31:59 +00:00
Treehugger Robot
aa9f37185f
Merge "Remove more obsolete MTD stuff."
2016-06-24 17:19:48 +00:00
Elliott Hughes
01e5a6c971
Remove more obsolete MTD stuff.
...
Bug: http://b/29250988
Change-Id: Ic2d0514fcdbe26526e87bc681b71efcc90eda678
Test: still builds.
2016-06-24 09:13:51 -07: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
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
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
Chih-Hung Hsieh
cdb2ca5d9f
Fix misc-macro-parentheses warnings in system/core.
...
Add parentheses around macro arguments used beside operators.
Bug: 28705665
Change-Id: I9226f319e283be640eddc31687f75b51a8ef0ac6
2016-06-22 14:33:13 -07:00
Elliott Hughes
32cc6c9908
Merge \"init: report createProcessGroup failure.\"
...
am: 2d690a920f
Change-Id: I4ec8df459aefa4aebb3cdf9ec5aa40bc4e727f39
2016-06-17 04:16:21 +00:00
Elliott Hughes
ad8e94e017
init: report createProcessGroup failure.
...
Also directly kill the initial pid for safety, like other libprocessgroup
users.
Change-Id: Ib28936aea19cceaeaa54734759d5ae0c252c7905
2016-06-15 14:49:57 -07:00
William Roberts
787468260d
Merge \\"ueventd: only relabel devices if there\\'s a delta\\" am: 95428817d6
...
am: 807fa4bd5c
Change-Id: I41a8c02332ae12dc1c4fbc9c45ee627a37ce6b77
2016-06-09 19:18:40 +00:00
Treehugger Robot
95428817d6
Merge "ueventd: only relabel devices if there's a delta"
2016-06-09 19:07:27 +00:00
Tom Cherry
39b1d2043e
Merge \\"init: expand arguments of services when they start\\" am: 86cd314af3
...
am: f6ee6e16d9
Change-Id: I995a23e3eaa19bca1c4dc7880d786b806bd53306
2016-06-08 22:55:40 +00:00
Tom Cherry
86cd314af3
Merge "init: expand arguments of services when they start"
2016-06-08 22:42:11 +00:00
Vitalii Tomkiv
69cfeabfc0
Merge \\"Add process priority to service definition.\\" am: 14b00baaae
...
am: 20cc2787cb
Change-Id: I12993eed4953a7bdd832de0c263ce8d4c2476969
2016-06-08 21:42:31 +00:00