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
Roland Levillain
3f3e2c678e
Remove Valgrind entries from fs_config.
...
Valgrind has been removed from the Android tree in 2018.
Test: n/a
Bug: 77856586
Change-Id: I3b51d9b2290a4276299725cdd5a53a5bba00166e
2019-03-13 17:12:00 +00: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
Martijn Coenen
4517e57ff5
Create /metadata/apex/[sessions].
...
For storing persistent apex session state.
Bug: 126740531
Test: builds
Change-Id: Ibf280764977768956b5512b2252d22ceaba31c1e
2019-03-12 22:05:20 +01:00
Vic Yang
19b3a51f64
Add support for no-vendor-variant VNDK
...
When no-vendor-variant VNDK is enabled, the vendor variant of VNDK
libraries are not installed. In this case, the vendor binaries need to
be able to link in the core variant.
Update the linker config so that we export such VNDK libraries to the
proper linker namespaces.
Bug: 119423884
Test: Enable no-vendor-variant VNDK for a dummy VNDK library. Boot and
check the vendor variant does not exist and only the core variant
is used.
Change-Id: I71274fdf61373663603a5fbc3497400420094fcf
2019-03-12 13:30:46 -07:00
Hans Boehm
67f9c17f0b
Merge "Fix wp and sp comparison bugs" am: 28fdb8e282 am: 1deb957b15
...
am: 8dc9aeec82
Change-Id: I9179b208f7760d3ab837e28a169f8144f9666129
2019-03-12 11:50:25 -07:00
Hans Boehm
8dc9aeec82
Merge "Fix wp and sp comparison bugs" am: 28fdb8e282
...
am: 1deb957b15
Change-Id: Id592242b07588c50a743c5b53eaecaca44b7acbb
2019-03-12 11:45:16 -07:00
Hans Boehm
1deb957b15
Merge "Fix wp and sp comparison bugs"
...
am: 28fdb8e282
Change-Id: If5eae1a7d63c284dc2d4eaf522e04ca8ddde1ca5
2019-03-12 11:41:07 -07:00
Hans Boehm
28fdb8e282
Merge "Fix wp and sp comparison bugs"
2019-03-12 18:27:52 +00:00
Neil Fuller
9358e0972f
Add an env variable for the tzdata module root
...
The ANDROID_TZDATA_ROOT maps to the /apex/com.android.tzdata
location on device like ANDROID_RUNTIME_ROOT maps to the
/apex/com.android.runtime location.
Bug: 128422035
Test: build only
Change-Id: Id90006004ca652564e530f3694600ac4afd798ed
2019-03-12 16:52:36 +00:00
David Anderson
b20df875c1
Merge "libfiemap_writer: Fix bugs in vfat handling." am: 7f6d6db24d am: 22a01eed3a
...
am: 1912bda2d8
Change-Id: I8f8189eaf7582d8f7ef628a4672ec5b991895604
2019-03-12 09:46:49 -07:00
David Anderson
1912bda2d8
Merge "libfiemap_writer: Fix bugs in vfat handling." am: 7f6d6db24d
...
am: 22a01eed3a
Change-Id: Ice4f2b39fb97cbda876e2b136a00834952c22e0d
2019-03-12 09:43:37 -07:00
David Anderson
22a01eed3a
Merge "libfiemap_writer: Fix bugs in vfat handling."
...
am: 7f6d6db24d
Change-Id: I654e9ce9b72ad9f52a7324b36fe227e1750ae741
2019-03-12 09:39:31 -07:00
David Anderson
7f6d6db24d
Merge "libfiemap_writer: Fix bugs in vfat handling."
2019-03-12 16:20:56 +00:00
Mark Salyzyn
034f0e16c0
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" am: 8d246b22ee am: 0e505123e1
...
am: cff70e6328
Change-Id: Ia451c27b22d998b20dd11024841c29cf073d5768
2019-03-12 09:06:14 -07:00
Mark Salyzyn
cff70e6328
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" am: 8d246b22ee
...
am: 0e505123e1
Change-Id: Ied66003c52cb2686795cbe93b1d9f0a5be7ad00c
2019-03-12 08:56:03 -07:00
Mark Salyzyn
0e505123e1
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"
...
am: 8d246b22ee
Change-Id: I085793a341d1de0ef666a68933de4b923da53f94
2019-03-12 08:51:53 -07:00
Mark Salyzyn
8d246b22ee
Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set"
2019-03-12 15:44:29 +00:00