David Anderson
dac57223ef
Merge "init: Format userdata_gsi if needed." am: 212693c7ae
...
am: bde4a82213
Change-Id: Ifc3e631250c5ad8a24b5a1d2708d38f41126e8c6
2019-01-25 12:53:50 -08:00
David Anderson
bde4a82213
Merge "init: Format userdata_gsi if needed."
...
am: 212693c7ae
Change-Id: Ia12d9de29dc59fd34c69d16579b7461128e4be34
2019-01-25 12:48:40 -08:00
David Anderson
212693c7ae
Merge "init: Format userdata_gsi if needed."
2019-01-25 20:39:49 +00:00
Neil Fuller
8dd123cda9
Merge "Move APEX symlink creation to alternative module" am: e41489a9a1
...
am: 76ff6282e8
Change-Id: Ib39161f6690cf7ca914396eb06bb70ad5cce464f
2019-01-25 11:03:46 -08:00
Neil Fuller
76ff6282e8
Merge "Move APEX symlink creation to alternative module"
...
am: e41489a9a1
Change-Id: I6ad89667367f10999e0ed313303c4c5e53e5b78a
2019-01-25 10:57:39 -08:00
Neil Fuller
e41489a9a1
Merge "Move APEX symlink creation to alternative module"
2019-01-25 18:42:12 +00:00
Sasha Smundak
240b4ab04a
Merge "Convert Android.mk file to Android.bp" am: 4830ba0fd1
...
am: b564e24363
Change-Id: Ic9b7203ae12e2adba3cadc699d408d9002d791c5
2019-01-25 10:34:35 -08:00
Sasha Smundak
b564e24363
Merge "Convert Android.mk file to Android.bp"
...
am: 4830ba0fd1
Change-Id: Ia2f59033a20d001bb8237f6ccd0fb3ac57f36e1e
2019-01-25 10:29:12 -08:00
Treehugger Robot
4830ba0fd1
Merge "Convert Android.mk file to Android.bp"
2019-01-25 18:17:54 +00:00
Tri Vo
338d78b7bd
Merge "Read selinux_denial_metadata from /vendor" am: 6600f978a4
...
am: 71fce27629
Change-Id: Iba119ab8619049ea9d63e052f785393dc1383e4a
2019-01-25 10:15:11 -08:00
Tom Cherry
ddcc5bf05e
Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING" am: afa0d88eea
...
am: bf2ea0fab7
Change-Id: Id0f8eaca9877201b9c132cede97c2a7afba13468
2019-01-25 10:12:55 -08:00
Tri Vo
71fce27629
Merge "Read selinux_denial_metadata from /vendor"
...
am: 6600f978a4
Change-Id: I7e67380198857ac24956d7ae2686e16dfe3d4d61
2019-01-25 10:02:26 -08:00
Tri Vo
6600f978a4
Merge "Read selinux_denial_metadata from /vendor"
2019-01-25 17:51:48 +00:00
Tom Cherry
bf2ea0fab7
Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING"
...
am: afa0d88eea
Change-Id: I5ee153fae1ec35c3ee25cee9185f03865e5ffbe7
2019-01-25 09:47:53 -08:00
Suren Baghdasaryan
6433963568
Merge changes from topic "re-revert move sched_policy functions" am: 1bcb634958
...
am: 1b40fa6bda
Change-Id: If121f3081afa10bdf6dc436f838769d4f23aa013
2019-01-25 09:43:33 -08:00
Suren Baghdasaryan
8f6481d8cd
[automerger skipped] DO NOT MERGE: Revert "Revert "Add dependencies on libprocessgroup for sched_policy users"" am: 9491078300 -s ours
...
am: 7f758a81e4 -s ours
am skip reason: subject contains skip directive
Change-Id: Icc1aed0aab4a45e674c56083648bdb348c73db3e
2019-01-25 09:27:31 -08:00
Suren Baghdasaryan
1b40fa6bda
Merge changes from topic "re-revert move sched_policy functions"
...
am: 1bcb634958
Change-Id: I82fc5590deaec7878bd87bb338544b72299b89fc
2019-01-25 09:26:39 -08:00
Elliott Hughes
269b78b989
Merge "Remove dead code." am: cdd0aaa3ae
...
am: 186d539b36
Change-Id: I1e5218d0b1e5a78b25d851da3b76b5cadef29df1
2019-01-25 09:26:23 -08:00
Tom Cherry
afa0d88eea
Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING"
2019-01-25 17:25:58 +00:00
Suren Baghdasaryan
7f758a81e4
[automerger skipped] DO NOT MERGE: Revert "Revert "Add dependencies on libprocessgroup for sched_policy users""
...
am: 9491078300 -s ours
am skip reason: subject contains skip directive
Change-Id: I6a090381ab3764d9ea2a5bed1de39aef1872b6a7
2019-01-25 09:21:34 -08:00
Elliott Hughes
186d539b36
Merge "Remove dead code."
...
am: cdd0aaa3ae
Change-Id: Iec8ef98b9f23f17c2ff016ea65583cbf2983d598
2019-01-25 09:21:08 -08:00
Suren Baghdasaryan
1bcb634958
Merge changes from topic "re-revert move sched_policy functions"
...
* changes:
DO NOT MERGE: Revert "Revert "Add dependencies on libprocessgroup for sched_policy users""
DO NOT MERGE: Revert "Revert "libcutils: Move sched_policy functions into libprocessgroup""
DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""
2019-01-25 17:09:02 +00:00
Elliott Hughes
cdd0aaa3ae
Merge "Remove dead code."
2019-01-25 17:01:27 +00:00
Suren Baghdasaryan
9491078300
DO NOT MERGE: Revert "Revert "Add dependencies on libprocessgroup for sched_policy users""
...
This reverts commit 1bef8c550c .
Reason for revert: AOSP is fixed with new vendor image
Change-Id: Ib341ac80e2f88c13a7815a490ea2d9422ebdf55f
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-25 16:49:18 +00:00
Suren Baghdasaryan
1bd127b72e
DO NOT MERGE: Revert "Revert "libcutils: Move sched_policy functions into libprocessgroup""
...
This reverts commit b5394db682 .
Reason for revert: AOSP is fixed with new vendor image
Change-Id: Ie1a2e0200600214a65f4fe2250c903c8e8ce0a29
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-25 16:49:09 +00:00
Suren Baghdasaryan
7bf4381a82
DO NOT MERGE: Revert "Revert "Add libprocessgroup into VNDK""
...
This reverts commit c4a02d25a9 .
Reason for revert: AOSP is fixed with new vendor image
Change-Id: Ifc1c4d51aa1b168ef62cf58275b908d98b9a04bf
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-25 16:48:58 +00:00
Hridya Valsaraju
d0fa1d8272
Merge "Populate header size for boot image header version 2 correctly" am: 1420c1371f
...
am: b991a1cc28
Change-Id: Icfb4748df5955faae13702133a94903ed602ec98
2019-01-25 08:37:40 -08:00
Hridya Valsaraju
b991a1cc28
Merge "Populate header size for boot image header version 2 correctly"
...
am: 1420c1371f
Change-Id: If560c95b4e4ef3d9c7b55df4da44ea611a4e3756
2019-01-25 08:31:32 -08:00
Treehugger Robot
1420c1371f
Merge "Populate header size for boot image header version 2 correctly"
2019-01-25 16:24:58 +00:00
Justin Yun
d4628bec66
Merge "vndk: workaround for building ld.config.<ver>.txt" am: c6792c3643
...
am: 9483b21143
Change-Id: I932a8e3cb026c159024017861042da2ef49d4302
2019-01-25 08:09:25 -08:00
Justin Yun
9483b21143
Merge "vndk: workaround for building ld.config.<ver>.txt"
...
am: c6792c3643
Change-Id: Ibbda001c11826a3080cb5cc6deb6d32bdb5fb385
2019-01-25 07:54:34 -08:00
Treehugger Robot
c6792c3643
Merge "vndk: workaround for building ld.config.<ver>.txt"
2019-01-25 15:41:49 +00:00
Justin Yun
5579bf14f6
vndk: workaround for building ld.config.<ver>.txt
...
ld.config.27.txt requires additional search paths for vendor
processes. Substitute '#VNDK27#' when building ld.config.<ver>.txt.
If <ver> equals 27, remove '#VNDK27#'. Otherwise, remove whole line
that starts with '#VNDK27#'.
Bug: 123209911
Bug: 123390078
Test: build ld.config.27.txt
Change-Id: Ie3a284ab39f17fa2f9a3285e080b2ba0da3663dc
2019-01-25 19:49:19 +09:00
Nicolas Geoffray
390f961d2a
Merge "Add APEX namespaces in ld.config.legacy.txt." am: 0e964ad1e8
...
am: dcdbd53a2b
Change-Id: Ic3bdf9742d821c8e97129b61cae85da639eb99a9
2019-01-25 01:58:28 -08:00
Nicolas Geoffray
dcdbd53a2b
Merge "Add APEX namespaces in ld.config.legacy.txt."
...
am: 0e964ad1e8
Change-Id: I6bb1c6d0bf182542bc8dd52bc466f09c199bc637
2019-01-25 01:49:13 -08:00
Nicolas Geoffray
0e964ad1e8
Merge "Add APEX namespaces in ld.config.legacy.txt."
2019-01-25 09:44:20 +00:00
Ray Essick
ea4d6d33ab
Merge "give media apex access to libmediametrics" am: 6a92b5c9c3
...
am: 8123770797
Change-Id: Idc9e3f86fa11ee2e76a5d7c15ab30e6bf2ab552c
2019-01-25 00:41:02 -08:00
Ray Essick
8123770797
Merge "give media apex access to libmediametrics"
...
am: 6a92b5c9c3
Change-Id: Ie39b395f7e4a09a95d1016f139cb7adca4cf6731
2019-01-25 00:38:01 -08:00
Treehugger Robot
6a92b5c9c3
Merge "give media apex access to libmediametrics"
2019-01-25 08:22:19 +00:00
Sasha Smundak
3a62fc44e8
Convert Android.mk file to Android.bp
...
See build/soong/README.md for more information.
Bug: 122332380
Test: treehugger
Change-Id: I39a69c722922cfb19059d10ff37132442f0337ba
2019-01-24 21:16:39 -08:00
Florian Mayer
b7688fa77a
Merge "Fix crash in libunwindstack." am: 8306597e8f
...
am: 95f9407848
Change-Id: I66b231fac078d1bea4bdfc10508134992a85d212
2019-01-24 20:43:34 -08:00
Florian Mayer
95f9407848
Merge "Fix crash in libunwindstack."
...
am: 8306597e8f
Change-Id: Iead0e058dd15d70ac9ccc58794119283df41c419
2019-01-24 20:39:14 -08:00
Treehugger Robot
8306597e8f
Merge "Fix crash in libunwindstack."
2019-01-25 04:29:30 +00:00
Ray Essick
baa0ce3785
give media apex access to libmediametrics
...
Bug: 112555455
Test: build, ctsmedia
Change-Id: I5455449533a6647fb2b4f617728ae693b2156fb9
2019-01-24 19:45:00 -08:00
Hridya Valsaraju
a057a33e68
Populate header size for boot image header version 2 correctly
...
Bootimage header size for header version 2 was being populated
incorrectly. Also, throw an error when an unsupported boot header
version is passed in as an argument.
Test: can see correct header size using unpack_bootimg.py
Bug: 111136242
Change-Id: Ia4ed7b2469a5296546627c91f441c496d67f5ce3
2019-01-24 16:48:51 -08:00
Florian Mayer
c479e4e789
Fix crash in libunwindstack.
...
Bug: 122657596
Test: New unit test that crashes without this change.
Change-Id: I5d978530a833345def94a58805d7ee93b23382bb
2019-01-24 16:29:36 -08:00
Tri Vo
79723cf05b
Merge "selinux: account for /product hash" am: 9ffdf5945d
...
am: 73b67bb41e
Change-Id: I89a9c3b22f3adee6c4d4166e8e710b2a075fc681
2019-01-24 16:18:29 -08:00
Tri Vo
73b67bb41e
Merge "selinux: account for /product hash"
...
am: 9ffdf5945d
Change-Id: I6241260a77c329222dede7f7ea7e0ea1c226e272
2019-01-24 16:13:27 -08:00
Vic Yang
a562ec58b8
Merge "libunwindstack: Move DwarfOp callback table to rodata section" am: 4c1798b6c1
...
am: f479dbf830
Change-Id: I755644562f01cd3a0458e999df0381cf991cd449
2019-01-24 16:07:03 -08:00
Tri Vo
9ffdf5945d
Merge "selinux: account for /product hash"
2019-01-25 00:04:34 +00:00