Neil Fuller
cd29f37e39
Merge "Move the logic for creating APEX-related symlinks"
2019-03-14 08:54:33 +00:00
David Anderson
808aac632e
Merge "libfiemap_writer: Fix the progress bar on VFAT partitions." am: ed5d1ca252
am: 90b78c6d0d
...
am: 44f54e0343
Change-Id: Id61a03b59cd506b15b37f985314ac4f747570a23
2019-03-13 19:10:05 -07:00
David Anderson
44f54e0343
Merge "libfiemap_writer: Fix the progress bar on VFAT partitions." am: ed5d1ca252
...
am: 90b78c6d0d
Change-Id: Iec44588fee1210fc0101ca5ad051135f9b974e02
2019-03-13 19:05:54 -07:00
David Anderson
90b78c6d0d
Merge "libfiemap_writer: Fix the progress bar on VFAT partitions."
...
am: ed5d1ca252
Change-Id: Ic7fea9196b809953048e5bf5fe037baa9c26fd4c
2019-03-13 19:01:45 -07:00
David Anderson
ed5d1ca252
Merge "libfiemap_writer: Fix the progress bar on VFAT partitions."
2019-03-14 01:51:27 +00:00
Elliott Hughes
37fbb17684
Merge "run-as: improve diagnostics on failure." am: e5de6db1dd
am: bfe0513107
...
am: ca41e88529
Change-Id: I0b7736485a21e69d58ab262993132599ee261628
2019-03-13 17:45:49 -07:00
Elliott Hughes
ca41e88529
Merge "run-as: improve diagnostics on failure." am: e5de6db1dd
...
am: bfe0513107
Change-Id: Id1fe5e5951df93f37dc39fa0c80a69ff603cbfd7
2019-03-13 17:41:39 -07:00
Elliott Hughes
bfe0513107
Merge "run-as: improve diagnostics on failure."
...
am: e5de6db1dd
Change-Id: I61e98d37cdff9ce9b65820e773c17e9a62c9084a
2019-03-13 17:37:26 -07:00
Elliott Hughes
e5de6db1dd
Merge "run-as: improve diagnostics on failure."
2019-03-14 00:26:32 +00:00
Tim Murray
2204bf50b8
Merge "lmkd: set PSI_POLL_PERIOD to 40ms" am: 92dcfb3187
am: 90cfb547d2
...
am: 8f66fc9000
Change-Id: I66d8ed75fb820edcd369e17eee4c83056edbea64
2019-03-13 16:43:58 -07:00
Tim Murray
8f66fc9000
Merge "lmkd: set PSI_POLL_PERIOD to 40ms" am: 92dcfb3187
...
am: 90cfb547d2
Change-Id: I3bcad580bb095c186d990de98723ec78463ba2d4
2019-03-13 16:39:49 -07:00
Tim Murray
90cfb547d2
Merge "lmkd: set PSI_POLL_PERIOD to 40ms"
...
am: 92dcfb3187
Change-Id: Ib8d6a2dc535e9cccad95c790da9454d5550b4cd2
2019-03-13 16:35:39 -07:00
Tim Murray
92dcfb3187
Merge "lmkd: set PSI_POLL_PERIOD to 40ms"
2019-03-13 23:27:13 +00:00
David Anderson
5df0092353
libfiemap_writer: Fix the progress bar on VFAT partitions.
...
We allocate VFAT file space by seeking and writing a single byte. It
turns out this is not fast enough to avoid invoking the progress
callback, so instead, we should seek in increments.
Bug: 126230649
Test: fiemap_writer_test gtest
Change-Id: I2b363af4ebde873411e8a3acd22ca68d175afe3f
2019-03-13 13:58:12 -07:00
Christopher Ferris
681d746bd8
Merge "Fix missing offset for apk." am: 9a00f596d3
am: fb3535ea56
...
am: 7255c42dda
Change-Id: I1f0f423f12df722f8cb0f059437e95953e4a1518
2019-03-13 11:49:27 -07:00
Christopher Ferris
7255c42dda
Merge "Fix missing offset for apk." am: 9a00f596d3
...
am: fb3535ea56
Change-Id: I41350b9fa79b6ef2df701344459133adf1507059
2019-03-13 11:37:26 -07:00
Christopher Ferris
fb3535ea56
Merge "Fix missing offset for apk."
...
am: 9a00f596d3
Change-Id: Ie4a9074591aef5869479dc6f872bff8ae1d54dee
2019-03-13 11:31:40 -07:00
Christopher Ferris
9a00f596d3
Merge "Fix missing offset for apk."
2019-03-13 18:16:05 +00:00
Elliott Hughes
964932d7ce
run-as: improve diagnostics on failure.
...
Bug: http://b/128523258
Test: manual
Change-Id: I4430a8d309c0e9b5315aaae3e7d223c05b7ea3e5
2019-03-13 11:16:03 -07:00
Neil Fuller
0ed52b789d
Move the logic for creating APEX-related symlinks
...
The existing location of logic for creating symlinks to files that have
moved into APEX does not get executed for -user builds, only
-userdebug and -eng. The new location is equally arbitrary but appears
to be invoked for -user, -userdebug and -eng targets.
Tested with:
make cleaninstall && lunch taimen-[user|userdebug|eng] && make droid
Inspected:
ls -l out/target/product/taimen/system/usr/icu
Bug: 128249030
Bug: 122985829
Bug: 124106384
Test: see above
Change-Id: I92a52d0b5ef97e8cb4f780691f8594e40f2fa6b3
2019-03-13 18:14:56 +00:00
Tim Murray
0e5c00f375
lmkd: set PSI_POLL_PERIOD to 40ms
...
200ms was too lenient when under severe memory pressure.
Test: boots, works
Bug: 127765309
Change-Id: I8e047de6318574a107720c56473ed0f25582e182
Signed-off-by: Tim Murray <timmurray@google.com>
2019-03-13 10:13:19 -07:00
Valerie Hau
e8a02dbb88
Merge "Revert "Fix wp and sp comparison bugs"" am: e61e8c6b62
am: 85178d56a4
...
am: 53cfb691ed
Change-Id: I20f2d2720b45c42ab4338d33cdb58c1b59052e7b
2019-03-13 08:47:46 -07:00
Valerie Hau
53cfb691ed
Merge "Revert "Fix wp and sp comparison bugs"" am: e61e8c6b62
...
am: 85178d56a4
Change-Id: I3cacdd7a09e132f98f4367ced3289c3c14df9398
2019-03-13 08:29:28 -07:00
Valerie Hau
85178d56a4
Merge "Revert "Fix wp and sp comparison bugs""
...
am: e61e8c6b62
Change-Id: Id7ee61d98e2354fe346d76b91be5a820c40eaf29
2019-03-13 08:20:13 -07:00
Valerie Hau
e61e8c6b62
Merge "Revert "Fix wp and sp comparison bugs""
2019-03-13 15:03:04 +00:00
Neil Fuller
43ffdff20d
Merge "Add an env variable for the tzdata module root" am: 822dbd8911
am: 8c8d8f5df9
...
am: 4f92416fa1
Change-Id: I60406b56c060a3e3775709aacf5cf38ad66db820
2019-03-13 02:03:17 -07:00
Neil Fuller
4f92416fa1
Merge "Add an env variable for the tzdata module root" am: 822dbd8911
...
am: 8c8d8f5df9
Change-Id: Id3d64d79c6874314ad35f26e2459fc316adf9141
2019-03-13 01:59:07 -07:00
Neil Fuller
8c8d8f5df9
Merge "Add an env variable for the tzdata module root"
...
am: 822dbd8911
Change-Id: I68b3dc4ee4dc8a5a0a6e8aade1e4490afbf20581
2019-03-13 01:54:55 -07:00
Neil Fuller
822dbd8911
Merge "Add an env variable for the tzdata module root"
2019-03-13 08:49:30 +00:00
Martijn Coenen
4fa4c2a6f9
Merge "Create /metadata/apex/[sessions]." am: 13b5c3bee7
am: 5cdb3a9af8
...
am: 3d62bd2e16
Change-Id: Ida561b285efae52985149ab90ad7bc6b96eb536b
2019-03-13 01:27:08 -07:00
Martijn Coenen
3d62bd2e16
Merge "Create /metadata/apex/[sessions]." am: 13b5c3bee7
...
am: 5cdb3a9af8
Change-Id: Ifa080ea5d8aea313f4bd2b9e63b8ec1f37ed7cc1
2019-03-13 01:18:58 -07:00
Martijn Coenen
5cdb3a9af8
Merge "Create /metadata/apex/[sessions]."
...
am: 13b5c3bee7
Change-Id: I0a1786a437377c7db2505c792f8a174b23042131
2019-03-13 01:08:59 -07:00
Martijn Coenen
13b5c3bee7
Merge "Create /metadata/apex/[sessions]."
2019-03-13 07:46:32 +00:00
Xin Li
8c27df0dd9
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 35c5cd9139
-s ours am: 652a53cf9a
-s ours
...
am: 7a3160642d
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie25ba4db2866bc538d44c351bddd963cd410efdc
2019-03-12 23:26:40 -07:00
The Android Open Source Project
6608de9d1e
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 4d916a1ece
-s ours am: 8ba23f2a77
-s ours
...
am: e4660ddc99
-s ours
am skip reason: subject contains skip directive
Change-Id: I5d90725e75f140c111188e13dba76dae683f3ba7
2019-03-12 23:02:09 -07:00
Jayant Chowdhary
190d874899
Merge "Special case init for android_is_in_vendor_process." am: 3dd9881ca7
am: 04d5b78403
...
am: 813aa75f08
Change-Id: I971e4447ec3e81d7185df8d182e7a7a32ceca289
2019-03-12 23:00:51 -07:00
Xin Li
7a3160642d
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: 35c5cd9139
-s ours
...
am: 652a53cf9a
-s ours
am skip reason: subject contains skip directive
Change-Id: I1fddbcb77b03465ad18d7622f9118e74bf955b32
2019-03-12 22:56:56 -07:00
The Android Open Source Project
e4660ddc99
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 4d916a1ece
-s ours
...
am: 8ba23f2a77
-s ours
am skip reason: subject contains skip directive
Change-Id: I448cd15c59dac97660765fc2a02e5ff611a3ed70
2019-03-12 22:34:21 -07:00
Jayant Chowdhary
813aa75f08
Merge "Special case init for android_is_in_vendor_process." am: 3dd9881ca7
...
am: 04d5b78403
Change-Id: I027bb7229d5d65953e7dc34dda19e7703bfd07cb
2019-03-12 22:32:54 -07:00
Xin Li
652a53cf9a
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
...
am: 35c5cd9139
-s ours
am skip reason: subject contains skip directive
Change-Id: I5b2a4e6c90f014b15658292134e374f2b3802208
2019-03-12 22:23:14 -07:00
The Android Open Source Project
8ba23f2a77
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
...
am: 4d916a1ece
-s ours
am skip reason: subject contains skip directive
Change-Id: I31a0756b75ab6d657dc26807ce8baeb42c40d232
2019-03-12 21:47:32 -07:00
Jayant Chowdhary
04d5b78403
Merge "Special case init for android_is_in_vendor_process."
...
am: 3dd9881ca7
Change-Id: I49c4d42398f13737e8ddc6c0c04ad685e561b463
2019-03-12 21:45:59 -07:00
Hans Boehm
a2a2ad8057
Revert "Fix wp and sp comparison bugs"
...
This reverts commit 029b12ebde
.
Reason for revert: There appear to be problems with null comparisons. Reported failure in HwcBufferCacheTest.
Change-Id: I19745bb281dabe8b05c2df3fe95e7be7a49dcd51
2019-03-13 03:24:12 +00:00
Xin Li
35c5cd9139
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
2019-03-13 02:26:03 +00:00
Jayant Chowdhary
3dd9881ca7
Merge "Special case init for android_is_in_vendor_process."
2019-03-13 00:07:05 +00:00
Christopher Ferris
86f2d9d943
Fix missing offset for apk.
...
The elf_start_offset field in a map_info was not set in one path.
Added new offline test for this, and update a few unit tests.
Bug: 128442792
Test: New unit tests pass.
Change-Id: I2c6ac1b5271a99aa0e8c4b6342a5970199185112
2019-03-12 16:00:55 -07:00
Jooyung Han
cfad2ba7df
Merge "Revert "Mark libs as double_loadable"" am: 1922a501bf
am: 037f039cd0
...
am: ccc0eda89c
Change-Id: I1435b0355762ca24d41e71e3525abf35c10d12e4
2019-03-12 15:34:38 -07:00
Jooyung Han
ccc0eda89c
Merge "Revert "Mark libs as double_loadable"" am: 1922a501bf
...
am: 037f039cd0
Change-Id: I54b6cb06d8a1d46042b45b9785ed4c00fe7eb96e
2019-03-12 15:29:26 -07:00
Jooyung Han
037f039cd0
Merge "Revert "Mark libs as double_loadable""
...
am: 1922a501bf
Change-Id: I9c5a3d811cbdb45a3d6bc7c4524e3d20a6959191
2019-03-12 15:25:15 -07:00
Treehugger Robot
1922a501bf
Merge "Revert "Mark libs as double_loadable""
2019-03-12 22:11:27 +00:00