Tom Cherry
984bd8323d
resolved conflicts for 5caca3dd
to mnc-dr-dev-plus-aosp
...
Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0
2015-09-21 14:25:34 -07:00
Evgenii Stepanov
fbaaddc588
am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
...
* commit '195842474a6722fdf2d967446b81d8accbd4648c':
asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:41:46 +00:00
Evgenii Stepanov
195842474a
am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
...
* commit 'ee08fb53bb59cb5037755d68de09e6e5bc3f8bc6':
asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:31:52 +00:00
Tim Murray
cba6ad7449
add system-background cpuset
...
add a new cpuset for system services that should not run on
larger cores
bug 24144797
Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
2015-09-18 13:18:49 -07:00
Ivan Krasin
5039d8cd21
asan: update condition to work with multiple SANITIZE_TARGET values.
...
The goal is to enable SANITIZE_TARGET='address coverage', which
will be used by LLVMFuzzer.
Bug: 22850550
Change-Id: Iea756eaaedaa56aee4daf714510269efe3aaa553
2015-09-18 11:59:46 -07:00
Badhri Jagan Sridharan
4c96af5e5a
am c939c61c: am a6c377b2: init: usb: Add configfs commands for USB gadget
...
* commit 'c939c61c71559271cbbd2c046e35e8a97b501b07':
init: usb: Add configfs commands for USB gadget
2015-09-10 00:50:43 +00:00
Badhri Jagan Sridharan
a6c377b2f6
init: usb: Add configfs commands for USB gadget
...
Adds init support for:
accessory
audio_source
midi
adb
rndis
Bug=23633457
Change-Id: I12e68e25969adafcf3170769f91ae939d08b7dbc
2015-09-08 20:13:37 -07:00
Vincent Palatin
2a0481109b
am 100de590: am 5e294902: Merge "init.usb.rc: fix USB typec property names" into mnc-dr-dev
...
* commit '100de590e7f82e1039eebc10e60ea554deeb1c3f':
init.usb.rc: fix USB typec property names
2015-09-04 20:06:28 +00:00
Tom Cherry
4bc10de99f
am cd1a65b6: am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit 'cd1a65b69ad2da81e654adab8edeead457a1b1f5':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:02:34 +00:00
Tom Cherry
c74403b4c9
am b00a8a06: am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
...
* commit 'b00a8a066f5b6ae5b8d0c03ee7f680389b38a260':
combine adbd.rc with init.usb.rc
2015-09-04 18:02:32 +00:00
Tom Cherry
cd1a65b69a
am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit '30c13c4954a959c2e6c5ba126f26d88b2e56be61':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 17:56:27 +00:00
Tom Cherry
b00a8a066f
am e8b0fcec: Merge "combine adbd.rc with init.usb.rc"
...
* commit 'e8b0fcecf4a17cf37b5fefbcceef0920788f776e':
combine adbd.rc with init.usb.rc
2015-09-04 17:56:25 +00:00
Tom Cherry
30c13c4954
Merge "move uncrypt from init.rc to uncrypt.rc"
2015-09-04 16:51:30 +00:00
Tom Cherry
008eb9b80a
move uncrypt from init.rc to uncrypt.rc
...
Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the
LOCAL_INIT_RC mechanism
Bug 23186545
Change-Id: Ibd838dd1d250c0e6536e44b69f11fb5ed42ba10b
2015-09-03 16:33:08 -07:00
Tom Cherry
2270dbbc84
combine adbd.rc with init.usb.rc
...
init.usb.rc and adbd.rc contain similar contents and belong in the same
file.
This file also belongs on the ramdisk as adbd is on the ramdisk, not the
system partition, therefore resolving to keep init.usb.rc in its current
location and combining the contents of adbd.rc is the best approach
Change-Id: I430f8fea58694679e7b8b7be69ce87daadd616f4
2015-09-03 16:19:04 -07:00
Tom Cherry
fdc6fbd0c7
am b2acb6b2: am b4998341: Merge "move init.trace.rc to frameworks/native"
...
* commit 'b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf':
move init.trace.rc to frameworks/native
2015-09-03 22:28:35 +00:00
Tom Cherry
b2acb6b2ce
am b4998341: Merge "move init.trace.rc to frameworks/native"
...
* commit 'b499834121854fd98664d8d96734c733f96dbc1f':
move init.trace.rc to frameworks/native
2015-09-03 22:02:40 +00:00
Tom Cherry
b0d5184774
move init.trace.rc to frameworks/native
...
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug 23186545
Change-Id: I55c37d3ff98c9ac10e6c1a713fadc7eb37346195
2015-09-03 14:19:11 -07:00
Vincent Palatin
3b7995b72e
init.usb.rc: fix USB typec property names
...
Fix typos in the usb typec properties (sys.usb.typec.*),
so the data_role and the power_role can be written properly in the sysfs.
Bug: 23790832
Change-Id: I90f591ab37825a07e0610ef1fec0e831eb19515d
2015-09-03 13:53:04 -07:00
Tim Murray
c9b308d155
am bb641d5f: am bc8c731a: Add zygote to the foreground cpuset.
...
* commit 'bb641d5f7714bdb8cd3ecc4f47cdd7c68e75d17a':
Add zygote to the foreground cpuset.
2015-09-03 06:22:42 +00:00
Badhri Jagan Sridharan
b081b8cdd1
am ddc296e8: am e1801863: init: usb: Add init scripts for configfs commands
...
* commit 'ddc296e841fa98bc89c0459d1dd3e438c790f15d':
init: usb: Add init scripts for configfs commands
2015-09-03 04:23:16 +00:00
Badhri Jagan Sridharan
1c791dfd3d
am 723b410f: am 48d59acc: init.usb.rc: Add new system property for configfs
...
* commit '723b410ff50920cea270b282c19edcfaf6f444e2':
init.usb.rc: Add new system property for configfs
2015-09-03 04:23:15 +00:00
Tim Murray
adef754b45
am 25a1b489: am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
...
* commit '25a1b4894d9fc249535f0e0b3851643eb172202f':
Add foreground/boost cpuset.
2015-09-03 04:22:24 +00:00
Tim Murray
bc8c731aab
Add zygote to the foreground cpuset.
...
This ensures that newly forked zygote processes will end up
in the corret cpuset.
bug 23751126
Change-Id: I987a2828cf2504963f1317d17f0b51d26cf22a70
2015-09-02 11:39:05 -07:00
Badhri Jagan Sridharan
e18018639b
init: usb: Add init scripts for configfs commands
...
This CL adds a new init script init.usb.configfs.rc
to add generic configfs commands. Setting
sys.usb.configfs in init.usb.{hardware}.rc
enables executing commands in this script
Bug=23633457
Change-Id: Iaae844a7957d6c9bf510648aaff86d56aa0c6243
2015-09-01 15:39:22 -07:00
Badhri Jagan Sridharan
48d59acc57
init.usb.rc: Add new system property for configfs
...
This CL helps to execute a different set of
commands for the usb configs specified in
init.usb.rc. Aimed at using configfs based
commands over android composition driver.
Bug=23633457
Change-Id: Ifa5f804e1cff93d15ad57d0ed553300bc5868936
2015-09-01 15:39:22 -07:00
Tim Murray
3985dda1c3
Add foreground/boost cpuset.
...
This is used for app launches (and maybe other high priority tasks
in the future). It's to be set to whatever cores should be used
for short term high-priority tasks.
bug 21915482
Change-Id: Id0ab0499146c09e860b97f4cb8095834cb12dd50
2015-08-25 00:31:54 -07:00
Tom Cherry
5ff07b2685
am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:28 +00:00
Tom Cherry
fbe3fa84ff
am 9b2bc347: am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"
...
* commit '9b2bc347659de454796acfc9402cbbc170efd133':
remove TARGET_PROVIDES_INIT_RC
2015-08-24 23:35:20 +00:00
Tom Cherry
0ea4ffdc06
remove TARGET_PROVIDES_INIT_RC
...
Change-Id: I15105a8dc11e218d95d4f5a4cee5b2a166d3d639
2015-08-24 13:56:43 -07:00
Tom Cherry
57a082f4de
resolved conflicts for merge of b21de5f6
to mnc-dev-plus-aosp
...
Change-Id: Ia0c7f2e33e22b2419811f7e68da276e02e156d08
2015-08-21 15:12:28 -07:00
Tom Cherry
22bc242a5b
resolved conflicts for merge of b21de5f6
to mnc-dr-dev-plus-aosp
...
Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b
2015-08-21 15:09:30 -07:00
Tom Cherry
837135a64f
remove bundled services from rootdir/init.rc
...
Services definitions for core services are now bundled with the source
for the service itself in the form of <service name>.rc. These
individual .rc files are now located in /system/init/... and are
parsed when the system partition is mounted.
Bug: 23186545
Change-Id: Ia1b73af8d005633aa4252d603892064d7804163d
2015-08-21 10:14:44 -07:00
Tim Kilbourn
bb41f7d6ed
am 94653364: Merge "Use init to write usb typec props" into mnc-dr-dev
...
* commit '946533648c49f2700b6e0f73383699597649ee60':
Use init to write usb typec props
2015-08-19 01:41:40 +00:00
Tim Kilbourn
8c12fdf4ab
Use init to write usb typec props
...
The sysfs nodes are owned by root, so use init to write role changes.
Bug: 21615151
Change-Id: I39ad03a23af0be9ac859d4fb79a46edc27e30f4e
2015-08-17 14:56:57 -07:00
Evgenii Stepanov
6c74e54544
am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
...
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:19 +00:00
Evgenii Stepanov
548f53d066
am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."
...
* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
Read global ASAN_OPTIONS from a file.
2015-08-17 01:15:06 +00:00
Evgenii Stepanov
428f626d1b
Merge "Read global ASAN_OPTIONS from a file."
2015-08-16 18:42:38 +00:00
Riley Andrews
94ee212af1
am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
...
* commit 'bc2cdfa8a00980f4c38ebcd67bac888b355e3787':
Added file permissions for binder tracing
2015-08-12 23:43:38 +00:00
Riley Andrews
87ea6cfb62
am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"
...
* commit 'bc2cdfa8a00980f4c38ebcd67bac888b355e3787':
Added file permissions for binder tracing
2015-08-12 23:43:02 +00:00
Riley Andrews
f63f36859e
am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
...
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
Added shell permisisons for memreclaim tracing
2015-08-12 23:28:40 +00:00
Riley Andrews
c1490ad9a0
am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
...
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
Added shell permisisons for memreclaim tracing
2015-08-12 23:26:34 +00:00
Scott Bauer
cd1d99e268
Added file permissions for binder tracing
2015-08-12 16:20:51 -07:00
Riley Andrews
a3a193ffd9
Merge "Added shell permisisons for memreclaim tracing"
2015-08-12 23:13:38 +00:00
Evgenii Stepanov
0d2dde57fe
Read global ASAN_OPTIONS from a file.
...
Instead of setting global ASAN_OPTIONS in immutable init.environ.rc,
load them from a file that can be changed later. The file has to be
on the /system partition to both be editable and available at the
early stages of boot.
Also add allocator_may_return_null=1 as that is closer to the
non-ASan allocator behavior.
Bug: 22846541
Change-Id: Ib0f41393c528f2e7cb398470e41f50abf5f4f455
2015-08-10 11:30:54 -07:00
Jeff Sharkey
94629bdec3
resolved conflicts for merge of 779a38a5
to mnc-dr-dev-plus-aosp
...
Change-Id: Ieaa0dcd8e93fba3060e9a85f17b1f5eabc6b8c9e
2015-08-06 14:22:46 -07:00
Jeff Sharkey
fdf1487493
resolved conflicts for merge of b9f438ff
to mnc-dev-plus-aosp
...
Change-Id: I7103bacb1b2d7dc29b4f8d9dddb2fec1feb869d3
2015-08-06 12:52:25 -07:00
Jeff Sharkey
779a38a5cd
am b9f438ff: Protect runtime storage mount points.
...
* commit 'b9f438ff841f87c8ffbca85b13a533718a18e15f':
Protect runtime storage mount points.
2015-08-06 19:35:56 +00:00
Jeff Sharkey
b9f438ff84
Protect runtime storage mount points.
...
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.
This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.
Also add CTS tests to verify that we're protecting access to
internal mount points like this.
Bug: 22964288
Change-Id: I32068e63a3362b37e8ebca1418f900bb8537b498
2015-08-06 11:45:31 -07:00
Daniel Rosenberg
764b7f561b
am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"
...
* commit 'e20a4194b8faacc542aee519a62a01954376be60':
rootdir: Create symlinks in Android.mk
2015-08-04 01:13:15 +00:00