Yifan Hong
0f50989a61
[automerger skipped] libprocessgroup: use libcgrouprc to read cgroup.rc am: 53e0deb7b2
am: c2cb4aa768
...
am: 30559a8a00
-s ours
am skip reason: change_id I635d9885db62e82f37421f6d20f59c84a6f4cbb2 with SHA1 fad638c82d
is in history
Change-Id: I531a2cc66c5374ad0a8ffdd0bb4e6b2294bfbf51
2019-04-03 13:59:24 -07:00
Yifan Hong
8fa5f95050
[automerger skipped] libprocessgroup_setup: use libcgrouprc_format am: d8ce1fb1d1
am: edca509a38
...
am: 818d7e3678
-s ours
am skip reason: change_id If5e2301a1b65c3f6a51a1661cfeeed4e299f634e with SHA1 1a0996a308
is in history
Change-Id: If71b56793a251a5c318787d680df32be6c9e294e
2019-04-03 13:58:25 -07:00
Yifan Hong
ba414d95c5
[automerger skipped] libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup am: 6f9ce2e548
am: c1c18f9a04
...
am: e7f9de2cc7
-s ours
am skip reason: change_id I941dc0c415e2b22ae663d43e30dc7a464687325e with SHA1 bd623a4ce0
is in history
Change-Id: Ifec90c82d6e1c58be8c6e1328cb858e6d3a8edcb
2019-04-03 13:57:38 -07:00
Yifan Hong
8298fc6177
[automerger skipped] libprocessgroup: Add libcgrouprc am: 098323ba5b
am: 15c6496640
...
am: 6dc78dc56f
-s ours
am skip reason: change_id I9c13c0528461758154e23cbab3a94ade7fb351ee with SHA1 d895647095
is in history
Change-Id: I9233b271e03ec67ff7bfa3ef728d227cc6aef01d
2019-04-03 13:56:51 -07:00
Yifan Hong
7a8be29c1c
[automerger skipped] libprocessgroup: Add libcgrouprc_format am: c4b3ab4edc
am: 7e7c203528
...
am: e470498138
-s ours
am skip reason: change_id Iaf6199f759a6264590b13ca7ba6d7f576c3ed56a with SHA1 f4212744ed
is in history
Change-Id: Ibcd0a74102a606e7dccc7f65f58cb56968d01fbb
2019-04-03 13:56:06 -07:00
Yifan Hong
10f7835736
Merge changes from topic "libprocessgroup_rc" am: 25d42eeaa6
...
am: 8f3d266984
Change-Id: Iec5b74b1e6a72f5afd1386f902aae7e942d104cd
2019-04-03 12:54:53 -07:00
Yifan Hong
794f523b80
Add libcgrouprc to ld.config.*.txt. am: 063b6beef0
...
am: 4e52c76d92
Change-Id: I4c05c28b213a3781cd94b34de64d95c7aaa22320
2019-04-03 12:54:05 -07:00
Yifan Hong
30559a8a00
libprocessgroup: use libcgrouprc to read cgroup.rc am: 53e0deb7b2
...
am: c2cb4aa768
Change-Id: Icb28519d3ed68751de8bad36611ab090b276a4bb
2019-04-03 12:53:13 -07:00
Yifan Hong
818d7e3678
libprocessgroup_setup: use libcgrouprc_format am: d8ce1fb1d1
...
am: edca509a38
Change-Id: I584367960506fcc724bb8a20b78cc5091084e131
2019-04-03 12:52:36 -07:00
Yifan Hong
e7f9de2cc7
libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup am: 6f9ce2e548
...
am: c1c18f9a04
Change-Id: I4d716a985ea666324d3daaaa0d00a5a90cd3c3ea
2019-04-03 12:51:59 -07:00
Yifan Hong
6dc78dc56f
libprocessgroup: Add libcgrouprc am: 098323ba5b
...
am: 15c6496640
Change-Id: I2e6969425516c307275f94d21d8161999eebecd4
2019-04-03 12:51:23 -07:00
Yifan Hong
e470498138
libprocessgroup: Add libcgrouprc_format am: c4b3ab4edc
...
am: 7e7c203528
Change-Id: Iadd78024c14c6406dda85743e7315b62a338dd1e
2019-04-03 12:50:46 -07:00
Yifan Hong
8f3d266984
Merge changes from topic "libprocessgroup_rc"
...
am: 25d42eeaa6
Change-Id: I73dab7acb0ae8359572c25e2138e11609d5878ef
2019-04-03 12:35:20 -07:00
Yifan Hong
4e52c76d92
Add libcgrouprc to ld.config.*.txt.
...
am: 063b6beef0
Change-Id: Iae9ed8a20e0dfed73489ba8973feab62e8d20065
2019-04-03 12:34:03 -07:00
Yifan Hong
c2cb4aa768
libprocessgroup: use libcgrouprc to read cgroup.rc
...
am: 53e0deb7b2
Change-Id: I154787974376c5bce3d158ac2b70a9444c0fc295
2019-04-03 12:32:51 -07:00
Yifan Hong
edca509a38
libprocessgroup_setup: use libcgrouprc_format
...
am: d8ce1fb1d1
Change-Id: I43c903bae8fdbe752d70914c088a4770e192af22
2019-04-03 12:31:25 -07:00
Yifan Hong
c1c18f9a04
libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup
...
am: 6f9ce2e548
Change-Id: I3a0ccd7894d17a83c898718807387968bef44c3a
2019-04-03 12:29:30 -07:00
Yifan Hong
15c6496640
libprocessgroup: Add libcgrouprc
...
am: 098323ba5b
Change-Id: Ia385e7d0af1b6f0801b9f4c3d88d756acebaa02a
2019-04-03 12:27:30 -07:00
Yifan Hong
7e7c203528
libprocessgroup: Add libcgrouprc_format
...
am: c4b3ab4edc
Change-Id: I5c24cd183a45d87997118c8fbe26d0b526ed78fd
2019-04-03 12:25:22 -07:00
Yifan Hong
25d42eeaa6
Merge changes from topic "libprocessgroup_rc"
...
* changes:
CgroupSetupCgroups -> CgroupSetup
Add libcgrouprc to ld.config.*.txt.
libprocessgroup: use libcgrouprc to read cgroup.rc
libprocessgroup_setup: use libcgrouprc_format
libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup
libprocessgroup: Add libcgrouprc
libprocessgroup: Add libcgrouprc_format
2019-04-03 19:08:51 +00:00
Yifan Hong
bd5853cb48
Merge changes from topic "libprocessgroup_rc"
...
* changes:
CgroupSetupCgroups -> CgroupSetup
Add libcgrouprc to ld.config.*.txt.
libprocessgroup: use libcgrouprc to read cgroup.rc
libprocessgroup_setup: use libcgrouprc_format
libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup
libprocessgroup: Add libcgrouprc
libprocessgroup: Add libcgrouprc_format
2019-04-03 16:41:21 +00:00
Julien Desprez
f3ec311a9c
Merge "Replace reboot-fastboot by reboot fastboot" am: cd68bda4ec
am: d2353d030f
...
am: 168be967f5
Change-Id: I32b6726dc8b03bf04a161ea3b8ced5aa29dfb923
2019-04-03 02:37:58 -07:00
Julien Desprez
168be967f5
Merge "Replace reboot-fastboot by reboot fastboot" am: cd68bda4ec
...
am: d2353d030f
Change-Id: I248e96898c155c019e0af826b92520f373e3773e
2019-04-03 02:30:33 -07:00
David Srbecky
50a70173e5
Merge "Check for data races when reading JIT/DEX entries." am: 59c70a5b75
am: 9363485979
...
am: 4d03a384c2
Change-Id: Ice57130b051b8e2024594856252acea834ffa990
2019-04-03 02:07:55 -07:00
Julien Desprez
d2353d030f
Merge "Replace reboot-fastboot by reboot fastboot"
...
am: cd68bda4ec
Change-Id: I311a3b93b27a8360aa81447d482e6c0c2e2cc404
2019-04-03 01:43:07 -07:00
David Srbecky
4d03a384c2
Merge "Check for data races when reading JIT/DEX entries." am: 59c70a5b75
...
am: 9363485979
Change-Id: If702c873330b09020dd701f5e786a03ca4d28ac0
2019-04-03 01:39:57 -07:00
Treehugger Robot
cd68bda4ec
Merge "Replace reboot-fastboot by reboot fastboot"
2019-04-03 08:24:34 +00:00
David Srbecky
9363485979
Merge "Check for data races when reading JIT/DEX entries."
...
am: 59c70a5b75
Change-Id: I64832ce6d28f0dd0c9036e48031ce3b9faae8dac
2019-04-03 01:17:45 -07:00
David Srbecky
59c70a5b75
Merge "Check for data races when reading JIT/DEX entries."
2019-04-03 07:15:39 +00:00
TreeHugger Robot
bdf2df0f15
Merge "Increase the SO_SNDBUF for statsd socket."
2019-04-03 05:55:26 +00:00
Yifan Hong
063b6beef0
Add libcgrouprc to ld.config.*.txt.
...
Test: boots (sanity)
Bug: 123664216
Change-Id: I23c3ece44816e4e213f9630b915e19978a259823
Merged-In: I23c3ece44816e4e213f9630b915e19978a259823
2019-04-02 22:31:57 -07:00
Yifan Hong
53e0deb7b2
libprocessgroup: use libcgrouprc to read cgroup.rc
...
Use the LL-NDK library to read cgroup.rc.
As a side-effect, the CgroupController class is changed
to a wrapper of ACgroupController* from the library. The
class itself essentially becomes the pointer, and can be
trivially copied. Modify all client code for this change.
Test: builds and boots
Bug: 123664216
Change-Id: I635d9885db62e82f37421f6d20f59c84a6f4cbb2
Merged-In: I635d9885db62e82f37421f6d20f59c84a6f4cbb2
2019-04-02 22:31:57 -07:00
Yifan Hong
d8ce1fb1d1
libprocessgroup_setup: use libcgrouprc_format
...
Use CgroupController definition from libcgrouprc_format, not
libprocessgroup, because the wire format will be removed
from libprocessgroup later.
Bug: 123664216
Test: builds
Change-Id: If5e2301a1b65c3f6a51a1661cfeeed4e299f634e
Merged-In: If5e2301a1b65c3f6a51a1661cfeeed4e299f634e
2019-04-02 22:31:57 -07:00
Yifan Hong
6f9ce2e548
libprocessgroup: Move CgroupSetupCgroups() to libprocessgroup_setup
...
Only init uses SetupCgroups. This functionality is
moved from libprocessgroup to its own library, and only
init links to it.
Also, merge CgroupSetupCgroups() with CgroupMap::SetupCgroups()
because the former is just an alias of the latter, and
CgroupMap does not belong to libcgrouprc_setup.
Test: boots
Bug: 123664216
Change-Id: I941dc0c415e2b22ae663d43e30dc7a464687325e
Merged-In: I941dc0c415e2b22ae663d43e30dc7a464687325e
2019-04-02 22:31:57 -07:00
Yifan Hong
098323ba5b
libprocessgroup: Add libcgrouprc
...
This module is an LL-NDK library that can be loaded by
modules that link to libprocessgroup (which is in VNDK).
This module defines APIs that reads cgroups.rc file
programatically. Internally, it uses libcgrouprc_format to
do so.
Test: builds
Bug: 123664216
Change-Id: I9c13c0528461758154e23cbab3a94ade7fb351ee
Merged-In: I9c13c0528461758154e23cbab3a94ade7fb351ee
2019-04-02 22:31:57 -07:00
Yifan Hong
c4b3ab4edc
libprocessgroup: Add libcgrouprc_format
...
This module defines the wire format of the mmap()ed cgroup.rc
file.
Test: builds
Bug: 123664216
Change-Id: Iaf6199f759a6264590b13ca7ba6d7f576c3ed56a
Merged-In: Iaf6199f759a6264590b13ca7ba6d7f576c3ed56a
2019-04-02 22:31:57 -07:00
Yifan Hong
9d7b89abea
CgroupSetupCgroups -> CgroupSetup
...
Test: builds
Bug: 123664216
Change-Id: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32
Merged-In: I47c46ca9ba5c1fbf3f9f7a1b185dc48b058b1e32
2019-04-02 22:31:57 -07:00
Josh Gao
fff6760db5
Merge "adb: fix mac build breakage." am: 52c6f1b6de
am: 94a23604c7
...
am: 0a2e8e94ae
Change-Id: Ic2966482db39cdb15eacb192606bca44b0fd5f6f
2019-04-02 22:17:39 -07:00
Jaegeuk Kim
a9b3c3d605
libfiemap_writer: test pinned file bit
...
The pinned file should have NOCOW_FL flag.
Bug: 129803146
Change-Id: Idaf5bdbbdcce1c3805cd16ddb0c1c7f1df87dcfb
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2019-04-03 04:35:33 +00:00
Josh Gao
0a2e8e94ae
Merge "adb: fix mac build breakage." am: 52c6f1b6de
...
am: 94a23604c7
Change-Id: Iea69d154f5867affcd4bafdeb77d8eb90bb7059d
2019-04-02 21:23:01 -07:00
Mark Salyzyn
f080bf39d3
Merge "ueventd: populate /dev/block/mapper link" am: 5c811fd01a
am: ee32edb306
...
am: ae0c91dad4
Change-Id: I00cf5253eb00976f38792aef63b72f9216c6cc2f
2019-04-02 21:21:41 -07:00
Josh Gao
94a23604c7
Merge "adb: fix mac build breakage."
...
am: 52c6f1b6de
Change-Id: I0a38a2bde7fc80d193e3e92e74264d2160f84084
2019-04-02 20:46:32 -07:00
Mark Salyzyn
ae0c91dad4
Merge "ueventd: populate /dev/block/mapper link" am: 5c811fd01a
...
am: ee32edb306
Change-Id: I8278fa28d430dc17f4e45b263314643ecb27631d
2019-04-02 20:27:17 -07:00
Treehugger Robot
52c6f1b6de
Merge "adb: fix mac build breakage."
2019-04-03 03:14:28 +00:00
Android Build Merger (Role)
fe018d96c0
Merge "Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6
am: cf2f309cff
am: ba78d39cdc"
2019-04-03 02:52:39 +00:00
Elliott Hughes
15e370aced
Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6
am: cf2f309cff
...
am: ba78d39cdc
Change-Id: I034c780c6c1166e4c6643ebcc607d3388246ebab
2019-04-02 19:52:28 -07:00
Elliott Hughes
bd8f02ce83
Merge "libcutils: android_reboot command should be unsigned." am: e3ec16b9c6
am: cf2f309cff
...
am: ba78d39cdc
Change-Id: I14687e2bd40564dab349b04dd1ca69ce112098a7
2019-04-02 19:52:24 -07:00
Mark Salyzyn
ee32edb306
Merge "ueventd: populate /dev/block/mapper link"
...
am: 5c811fd01a
Change-Id: I3f080cd0cfba9456dc5f1cff478dd47845cb6b19
2019-04-02 19:49:05 -07:00
Android Build Merger (Role)
af200d9bc5
Merge "[automerger skipped] Merge "Report last atom tag of the failed stats log." am: b7080aab9d
am: 4f0c63c4f2
am: b3b1f10fff
-s ours am skip reason: change_id I4de61a2eea393e8518cb76147598778293440a81 with SHA1 cf776d9b83
is in history"
2019-04-03 02:45:28 +00:00
yaochen
ae740d3bf6
[automerger skipped] Merge "Report last atom tag of the failed stats log." am: b7080aab9d
am: 4f0c63c4f2
...
am: b3b1f10fff
-s ours
am skip reason: change_id I4de61a2eea393e8518cb76147598778293440a81 with SHA1 cf776d9b83
is in history
Change-Id: Id47d1882263a2b47ca8bb8f2297a7db17c9cc9e2
2019-04-02 19:45:16 -07:00