Commit graph

23300 commits

Author SHA1 Message Date
Patrick Tjin
31788415ed Create symlink in the case where device has no cache partition
am: c6535a343f

* commit 'c6535a343f0b0bdd0f4171f0b4c9be401beebf77':
  Create symlink in the case where device has no cache partition

Change-Id: Ibcec898104e6509e70647576611ecc7d887f163d
2016-05-14 03:36:41 +00:00
Patrick Tjin
c6535a343f Create symlink in the case where device has no cache partition
Create symlink from /cache to /data/cache for devices
which have no cache partition.

Bug: 28747374
Change-Id: Ifb0c3250f1be345ce46fcdb78533e36c2250bb85
2016-05-13 15:25:04 -07:00
Rob Herring
9582b1a3f1 Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5 am: 0da9f42f2c
am: a0c90085ec

* commit 'a0c90085ecd2477e8ccdcc7155e92ab38a8e928c':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: I1cec0aabbc48581dd3d049a1948fbd99b708a386
2016-05-13 21:57:31 +00:00
Rob Herring
a0c90085ec Merge "init: support matching sysfs class paths in ueventd.rc" am: faa14b94d5
am: 0da9f42f2c

* commit '0da9f42f2c2ec6985018ad45603b32532d096a60':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: Ifc85ba3205a5207a4285da94b483164490dbde4d
2016-05-13 21:54:48 +00:00
Rob Herring
0da9f42f2c Merge "init: support matching sysfs class paths in ueventd.rc"
am: faa14b94d5

* commit 'faa14b94d5a6d0c3d429516bf226b9836f65da91':
  init: support matching sysfs class paths in ueventd.rc

Change-Id: Icb642a52ec834d450b2f7357b63370021986a06e
2016-05-13 21:52:06 +00:00
Treehugger Robot
faa14b94d5 Merge "init: support matching sysfs class paths in ueventd.rc" 2016-05-13 21:38:12 +00:00
Rob Herring
6de783af07 init: support matching sysfs class paths in ueventd.rc
Currently, ueventd.rc files only support /sys/devices/... paths
and don't support symlinked paths, specifically /sys/class/...
Supporting the class paths is necessary to have non-hardware
dependent paths. Some subsystems like IIO use /sys/bus/iio/, so
support that as well.

Change-Id: I29f3bf67b41664d1d75ac1820c46e13afe336d56
Signed-off-by: Rob Herring <robh@kernel.org>
2016-05-13 13:46:46 -07:00
Rob Herring
fe56b450e9 Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9 am: e7028e3d38
am: 7aef62751b

* commit '7aef62751bd8a070c6d3d9b45987b0ed6d495658':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: I96210ae1c1e1a90ee482a430cd40f9f1b9169e4a
2016-05-13 20:35:59 +00:00
Rob Herring
7aef62751b Merge "init: rework fixup_sys_perms to use perm_path_matches" am: 0504a94cd9
am: e7028e3d38

* commit 'e7028e3d382ee4099cfc4c1cbfa650fd2f820410':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: Iaebea1a143b053ee1c41c47cb5eb2329f992330f
2016-05-13 20:33:28 +00:00
Rob Herring
e7028e3d38 Merge "init: rework fixup_sys_perms to use perm_path_matches"
am: 0504a94cd9

* commit '0504a94cd9a1f6f5788051fceba6fb2d4bcc3615':
  init: rework fixup_sys_perms to use perm_path_matches

Change-Id: Ibfc3562cbc32326faa4e857e9b3a52b4a359c5c0
2016-05-13 20:30:52 +00:00
Treehugger Robot
0504a94cd9 Merge "init: rework fixup_sys_perms to use perm_path_matches" 2016-05-13 20:23:44 +00:00
Mohamad Ayyash
6efba6a826 Merge "Move canned_fs_config into libcutils" am: e62cec6e39 am: b44077d8bf
am: d21c737db4

* commit 'd21c737db46818805691dea127ef260cc722cf77':
  Move canned_fs_config into libcutils

Change-Id: I896702baf951bf9c07b1cf8859b2d10bbd047251
2016-05-13 18:27:28 +00:00
Mohamad Ayyash
d21c737db4 Merge "Move canned_fs_config into libcutils" am: e62cec6e39
am: b44077d8bf

* commit 'b44077d8bfc719851dee30c5a831fc567d710d2b':
  Move canned_fs_config into libcutils

Change-Id: If295243e346b89c66ecf114ee889b7d821bce3ac
2016-05-13 18:24:59 +00:00
Mohamad Ayyash
b44077d8bf Merge "Move canned_fs_config into libcutils"
am: e62cec6e39

* commit 'e62cec6e39839c1dc71ec7be6e5b361e3514c388':
  Move canned_fs_config into libcutils

Change-Id: I3e47664218061a5a6268db9de6a669d6b5e58b03
2016-05-13 18:22:48 +00:00
Treehugger Robot
e62cec6e39 Merge "Move canned_fs_config into libcutils" 2016-05-13 18:13:22 +00:00
David Pursell
2a3a23eae5 Merge "adb: support forwarding TCP port 0." am: cb90562bcf am: 5aaffac37e
am: 1e57ab6f7b

* commit '1e57ab6f7b703848a3023d6367bff26019632588':
  adb: support forwarding TCP port 0.

Change-Id: I8810c085f2bdcfac9311b5d5010b7bff8757408e
2016-05-13 15:23:15 +00:00
David Pursell
1e57ab6f7b Merge "adb: support forwarding TCP port 0." am: cb90562bcf
am: 5aaffac37e

* commit '5aaffac37e2b2b32e645c0c03c96a88a3133b3ae':
  adb: support forwarding TCP port 0.

Change-Id: I2e7bd29de76a87b80e71ce00ed2da4666f3cbb56
2016-05-13 15:21:04 +00:00
David Pursell
5aaffac37e Merge "adb: support forwarding TCP port 0."
am: cb90562bcf

* commit 'cb90562bcfb36a31fc5ced592bf321b370e67d15':
  adb: support forwarding TCP port 0.

Change-Id: Icb872f79b4768d1a730db7cac5f6eb1b15f3d966
2016-05-13 15:17:46 +00:00
David Pursell
cb90562bcf Merge "adb: support forwarding TCP port 0." 2016-05-13 15:12:51 +00:00
Mohamad Ayyash
8374276bfa Move canned_fs_config into libcutils
It's no longer specific to make_ext4fs, will be used for mksquashfs as
well.

BUG: 27467028
Change-Id: I41b8c2b168ada45c8378dee522391edfb8f6b9a6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
BUG: 28704419
2016-05-12 18:44:13 -07:00
Irina Patru
403461f67d Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506 am: 2618d90c2f
am: 12397f202f

* commit '12397f202f97da7dcd40d45159696bc6be50aaf6':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I256d702368c1b4ed8688006abb5202dcc0d11f83
2016-05-12 18:16:09 +00:00
Irina Patru
12397f202f Merge "init.rc: Remove cpu weight set on the root cgroup" am: 422492c506
am: 2618d90c2f

* commit '2618d90c2fa3f952a195dfd4ecd9f92ec462bccb':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I2663c368032a3c9f851de7d1e47f68c3a25b0d52
2016-05-12 18:13:14 +00:00
Irina Patru
2618d90c2f Merge "init.rc: Remove cpu weight set on the root cgroup"
am: 422492c506

* commit '422492c5063956e4f69bdbe01a30b0bc54a5fb2c':
  init.rc: Remove cpu weight set on the root cgroup

Change-Id: I23bf6dda65cc795efc0babb5a8806e74fd0e7ed1
2016-05-12 18:10:07 +00:00
Treehugger Robot
422492c506 Merge "init.rc: Remove cpu weight set on the root cgroup" 2016-05-12 18:05:46 +00:00
Mark Salyzyn
5381c1ad21 Merge "liblog: sleep 20ms before critical property_set" am: 1d560ff24a am: 03ac8fe0be
am: 5d76be85a4

* commit '5d76be85a4f12af7e5118baebfff3b4e1711eb3d':
  liblog: sleep 20ms before critical property_set

Change-Id: I33b96980cab5f3dbf4f71976791d9c4337967ed6
2016-05-12 16:52:06 +00:00
Mark Salyzyn
5d76be85a4 Merge "liblog: sleep 20ms before critical property_set" am: 1d560ff24a
am: 03ac8fe0be

* commit '03ac8fe0be882b09d7faba4d5f96e536a94198ab':
  liblog: sleep 20ms before critical property_set

Change-Id: I91d3262a478f83556851881208fb1f83de62f189
2016-05-12 16:48:21 +00:00
Mark Salyzyn
03ac8fe0be Merge "liblog: sleep 20ms before critical property_set"
am: 1d560ff24a

* commit '1d560ff24a30dfac9f8e71847883ca4fef5f953c':
  liblog: sleep 20ms before critical property_set

Change-Id: I09197251d8ba5efb87c47e3e496bfe1c826e8688
2016-05-12 16:45:51 +00:00
Treehugger Robot
1d560ff24a Merge "liblog: sleep 20ms before critical property_set" 2016-05-12 16:38:07 +00:00
Mark Salyzyn
5cceee6404 liblog: sleep 20ms before critical property_set
Going too fast can result in the property not being set
and causing an extreme corner case failure being reported
and blamed on is_loggable functionality.

Bug: 25792367
Change-Id: Idda6f67d655d8a84d2809daf695394d5293e7431
2016-05-12 15:58:57 +00:00
Irina Patru
c560c6310f init.rc: Remove cpu weight set on the root cgroup
It isn't allowed to change the cpu.share value for the root cgroup.
See kernel commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ec7dc8ac73e4a56ed03b673f026f08c0d547f597

This fixes the following error seen in dmesg:
init: write_file: Unable to write to '/dev/cpuctl/cpu.shares': Invalid argument

BUG: 28735908

Change-Id: I5ef359fb275792f99d13d35c62499026d354f6af
Signed-off-by: Irina Patru <irina.patru@intel.com>
2016-05-12 14:57:31 +03:00
Dimitry Ivanov
8d1bd70e9f Move linker-namespace functions declarations am: c337cae9ad
am: f031971771

* commit 'f031971771bee7c527997deebbbd0a6993676767':

Change-Id: I191228ae86d8c6e142dbfdc261f009aba5a93512
2016-05-12 01:13:02 +00:00
Dimitry Ivanov
f031971771 Move linker-namespace functions declarations
am: c337cae9ad

* commit 'c337cae9adcb538a4562641f97bdde933d085a82':
  Move linker-namespace functions declarations

Change-Id: Iab15bb8cf23a5fa342f7c51d05322ccd6c54958e
2016-05-12 00:45:33 +00:00
Android Build Merger (Role)
4cb52c3288 Merge "Move linker-namespace functions declarations am: c337cae9ad am: 7c9b3df8ac" into nyc-mr1-dev-plus-aosp 2016-05-11 23:30:46 +00:00
Dimitry Ivanov
4e74274624 Move linker-namespace functions declarations am: c337cae9ad
am: 7c9b3df8ac

* commit '7c9b3df8ac2f448fa89dbb86e3a39b1efb8da8ce':
  Move linker-namespace functions declarations

Change-Id: I4105bdbfbcfecbd37ea235d18e16f9ee8284f08a
2016-05-11 23:30:40 +00:00
Dimitry Ivanov
2cd8c48f44 Merge commit '7c9b3df8ac2f448fa89dbb86e3a39b1efb8da8ce' into manual_merge_7c9b3df 2016-05-11 16:25:40 -07:00
Dimitry Ivanov
7c9b3df8ac Move linker-namespace functions declarations
am: c337cae9ad

* commit 'c337cae9adcb538a4562641f97bdde933d085a82':
  Move linker-namespace functions declarations

Change-Id: Ia6351368a781739b08504034c2a2d59a7fbbde82
2016-05-11 23:14:44 +00:00
Paul Lawrence
c27d99aea2 Add fileencrypted=software/ice to fstab options
am: 5b8a108ef5

* commit '5b8a108ef5c9ec2a11a1b7afd4e9d4a4d8444854':
  Add fileencrypted=software/ice to fstab options

Change-Id: I5bc87bb273fed4316a5991e91ce97647ae44c500
2016-05-11 22:20:39 +00:00
Elliott Hughes
b2c88646dd Merge "Report errno more often in fastboot." am: 8c5384e50b am: 272b2694cd
am: 7f80f04a2c

* commit '7f80f04a2ce9b3fa28be456c89c50a5fd2b5923d':
  Report errno more often in fastboot.

Change-Id: Id6c53aa1a2d34fcb4c4f49fac34fc83209ac1703
2016-05-11 21:51:18 +00:00
Dimitry Ivanov
f336aadee4 Merge "Move linker-namespace functions declarations" am: 37ed923d1c am: 3f0a12622b
am: 17decbd637

* commit '17decbd637ab9dba0d87ea8cb92867c4117b5a7d':
  Move linker-namespace functions declarations

Change-Id: Ic40bfbc3e1c087f21163193462affa178ed82ce2
2016-05-11 21:51:09 +00:00
Elliott Hughes
7f80f04a2c Merge "Report errno more often in fastboot." am: 8c5384e50b
am: 272b2694cd

* commit '272b2694cd3556120a3e39b88a0702103e2ed58a':
  Report errno more often in fastboot.

Change-Id: Ie26d2c70e65b70c08017f848f21fb91d6f20e3a4
2016-05-11 21:50:07 +00:00
Elliott Hughes
272b2694cd Merge "Report errno more often in fastboot."
am: 8c5384e50b

* commit '8c5384e50bfbc97e4b4ea74e52391879a09b68fa':
  Report errno more often in fastboot.

Change-Id: I19a33597f29c1974063d4308eeccea60bbb350f5
2016-05-11 21:39:00 +00:00
Dimitry Ivanov
17decbd637 Merge "Move linker-namespace functions declarations" am: 37ed923d1c
am: 3f0a12622b

* commit '3f0a12622b8d35f1223945498a086e19c791bf24':
  Move linker-namespace functions declarations

Change-Id: I6f3e8b5ef608e3b930510b5c483ec6e7963eb4f7
2016-05-11 21:29:15 +00:00
Elliott Hughes
8c5384e50b Merge "Report errno more often in fastboot." 2016-05-11 21:27:44 +00:00
Dimitry Ivanov
3f0a12622b Merge "Move linker-namespace functions declarations"
am: 37ed923d1c

* commit '37ed923d1c08b8b9204a6a66f11bbf0b4375d35b':
  Move linker-namespace functions declarations

Change-Id: I91b184943a9a1cfa286f7e8ebb2df21f34063a3d
2016-05-11 21:22:02 +00:00
Dimitry Ivanov
c337cae9ad Move linker-namespace functions declarations
They are intended for platform use only and we shouldn't have them
in the public header file. This CL moves them to libnativeloader
private header file.

Bug: http://b/28174921
Change-Id: I01cf446d2d8d7cf6f9e31130aa3d4e54fbbbb9fc
(cherry picked from commit 6796522256)
2016-05-11 14:20:12 -07:00
Dimitry Ivanov
37ed923d1c Merge "Move linker-namespace functions declarations" 2016-05-11 21:14:41 +00:00
Elliott Hughes
53ec495b40 Report errno more often in fastboot.
Change-Id: I4b4b47c584a146b38876a379f26ceb20d071c643
2016-05-11 12:39:27 -07:00
Elliott Hughes
2be0ffb71a Merge "Add a fortify test to crasher." am: e674d32d2d am: 4434b42cd0
am: 69541606c1

* commit '69541606c1a6b6e1ee8b3b59fa5d592aee3e6851':
  Add a fortify test to crasher.

Change-Id: I62e668bb7d7b07fbc7f84543714ba37aee5c27c0
2016-05-11 18:02:51 +00:00
Elliott Hughes
69541606c1 Merge "Add a fortify test to crasher." am: e674d32d2d
am: 4434b42cd0

* commit '4434b42cd0bd36be4ca7702e840886f67daaff2d':
  Add a fortify test to crasher.

Change-Id: I3b8b473aa256b7de7ca5e50e14b32d0c3b0565e1
2016-05-11 17:59:47 +00:00
Elliott Hughes
4434b42cd0 Merge "Add a fortify test to crasher."
am: e674d32d2d

* commit 'e674d32d2d2816255c836cb7eed51eee6c9e8147':
  Add a fortify test to crasher.

Change-Id: I7d4c1342c514c73d195ad970703bb20338633db8
2016-05-11 17:56:16 +00:00