Chen Xu
bc9322142c
Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d
am: 3af5f639bb
am: 24a87ba928
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002
Change-Id: I52afec010acd5b0ac02156369e18c73e71638b8e
2020-06-19 06:42:05 +00:00
Chen Xu
24a87ba928
Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d
am: 3af5f639bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002
Change-Id: I1221abd1e4a786b7f843ff58a7205fe83eaf9a17
2020-06-19 06:17:59 +00:00
Chen Xu
3af5f639bb
Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev am: 99e317ce2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11922002
Change-Id: I47f22a1465bc6a4b89d376d151e1fdfcd58f17b5
2020-06-19 06:00:06 +00:00
Chen Xu
99e317ce2d
Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev
2020-06-19 05:49:39 +00:00
TreeHugger Robot
f7e25caf34
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
am: 7f78fbe044
am: 5e074117fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I6506df3bc528e26d915ed5c053f4d83e5c98c385
2020-06-19 04:16:37 +00:00
TreeHugger Robot
c0047b8ffa
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
am: 7fe2cf07aa
am: a523a4cde5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I19383d1d1091e7ca7e0bf598a758b49b2c1f79a4
2020-06-19 04:16:31 +00:00
TreeHugger Robot
8624418602
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
am: 7f78fbe044
am: 4c1ee140c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I1c2c82e7d734d44c9ae028e07859ef557bb621b1
2020-06-19 04:16:24 +00:00
TreeHugger Robot
a523a4cde5
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
am: 7fe2cf07aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I4eda50c39b6cc3e1f9e0f189f82e5ec279afc665
2020-06-19 04:11:49 +00:00
TreeHugger Robot
5e074117fd
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
am: 7f78fbe044
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I71275d2ed20368ebb90aa98245aae8240a367cdb
2020-06-19 03:59:06 +00:00
TreeHugger Robot
4c1ee140c3
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
am: 7f78fbe044
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I0810f1dc2fe31ac93181715f63d8fb6e48715d6f
2020-06-19 03:58:38 +00:00
TreeHugger Robot
7fe2cf07aa
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: Ib79da635eda60f3290402cb47d79600737c12d2a
2020-06-19 03:41:56 +00:00
TreeHugger Robot
7f78fbe044
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev am: b8f8fc6a88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11923072
Change-Id: I72a9b35421440dbe4d38e09b01bb8a2f76618803
2020-06-19 03:41:35 +00:00
TreeHugger Robot
b8f8fc6a88
Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev
2020-06-19 03:20:24 +00:00
TreeHugger Robot
d3c739dc89
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: 3e48036c15
am: cb13a6015a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: Ifa0b24274fc896c0b7a27d8bb3f34749e6fe8da0
2020-06-19 02:17:35 +00:00
Automerger Merge Worker
eb2965696a
Merge "Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: a47ca3bb29
am: 9bcfd86500" into rvc-qpr-dev-plus-aosp
2020-06-19 02:17:22 +00:00
TreeHugger Robot
493049baea
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: a47ca3bb29
am: 9bcfd86500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: I7a4409acfb1689294262b69619a31a6edfbb9323
2020-06-19 02:17:18 +00:00
TreeHugger Robot
0e32c50035
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: a47ca3bb29
am: 7bf4d709ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: Ic1591f26c3fa77d5273d8ea2ce1c12971656aad4
2020-06-19 02:17:12 +00:00
TreeHugger Robot
7bf4d709ee
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: a47ca3bb29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: I767e6fa1f6255f4d5b0280e98f061a14e78c6d9d
2020-06-19 01:58:22 +00:00
TreeHugger Robot
cb13a6015a
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: 3e48036c15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: I6dd360536c07b1d0ebe51aca9afe3b8d09a03a78
2020-06-19 01:58:22 +00:00
TreeHugger Robot
9bcfd86500
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
am: a47ca3bb29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: I964deaeb6fe4cddc67d448e470d2da2bec2010fd
2020-06-19 01:57:48 +00:00
TreeHugger Robot
3e48036c15
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: I1c20546b4b937b13333d3256a7f8aacc5ef8161b
2020-06-19 01:40:58 +00:00
TreeHugger Robot
a47ca3bb29
Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080
Change-Id: I9b88e5dbecd5a140058570640bfcdaf2138b7fdc
2020-06-19 01:40:30 +00:00
TreeHugger Robot
22f98f1885
Merge "notice files in system_other becomes included in system's one" into rvc-dev
2020-06-19 01:23:26 +00:00
yawanng
77107a17e5
iorap: Turn off pinner by default for large memory devices.
...
Bug: 157667363
Test: Make
Change-Id: I980a470596da3bf4e500bbd6c517e1a022c2d1a0
2020-06-19 00:47:17 +00:00
Chen Xu
ced4dd2d99
Do not include CellBroadcastLegacy for Go devices
...
CellBroadcastLegacy app is for migrating data from pre-mainline world.
Go devices do not take mainline module, thus excluding this apk
from build. Otherwise, both CellBroadcastLegacy app and
CellBroadcastAppPlatform will have the same package name
com.android.cellbroadcastreceiver
Bug: 157702986
Test: build go target: walleye_svelte-userdebug
Change-Id: I254a8af334580b79ffdbc9e8bfa95b23500f507e
2020-06-18 15:41:23 -07:00
Paul Duffin
bac66eaeac
[automerger skipped] Merge "Fail check-boot-jars if boot jar contains 0 .class files" am: e5fc8fdf5e
am: 7e3a36b3ef
-s ours am: cc75f93e00
-s ours am: ff8b1316ee
-s ours
...
am skip reason: Change-Id I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2 with SHA-1 92d41de8f2
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1341793
Change-Id: Ie7283371cff5736082128624e6a2f267ab98f9de
2020-06-18 20:31:20 +00:00
Sophie Zheng
e358aba416
Merge "NDK api code coverage" am: 34fe2651ed
am: 5a8764a6a7
am: 4ed1925587
am: 8570319df5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181
Change-Id: I978d730ddb1304a8dd4dee4ecb1e2f983293f5f6
2020-06-18 20:30:25 +00:00
Paul Duffin
ff8b1316ee
[automerger skipped] Merge "Fail check-boot-jars if boot jar contains 0 .class files" am: e5fc8fdf5e
am: 7e3a36b3ef
-s ours am: cc75f93e00
-s ours
...
am skip reason: Change-Id I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2 with SHA-1 92d41de8f2
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1341793
Change-Id: I5f1d6c7283522c097f2adc1d8a66d1f02939fe6a
2020-06-18 20:14:30 +00:00
Sophie Zheng
8570319df5
Merge "NDK api code coverage" am: 34fe2651ed
am: 5a8764a6a7
am: 4ed1925587
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181
Change-Id: Id6625f23996bd3d03a9a64bff754c1579b43ec9b
2020-06-18 20:13:40 +00:00
Paul Duffin
cc75f93e00
[automerger skipped] Merge "Fail check-boot-jars if boot jar contains 0 .class files" am: e5fc8fdf5e
am: 7e3a36b3ef
-s ours
...
am skip reason: Change-Id I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2 with SHA-1 92d41de8f2
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1341793
Change-Id: Ie3a7d9df6c727257d85b23714abc06dceea155cb
2020-06-18 20:00:33 +00:00
Sophie Zheng
4ed1925587
Merge "NDK api code coverage" am: 34fe2651ed
am: 5a8764a6a7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181
Change-Id: I3206b6a5915bdf9ea46b80b523428876f9e8662b
2020-06-18 20:00:24 +00:00
Paul Duffin
7e3a36b3ef
Merge "Fail check-boot-jars if boot jar contains 0 .class files" am: e5fc8fdf5e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1341793
Change-Id: Iadc2872f8fd53d890dc8ba15344b53dbe071004e
2020-06-18 19:46:40 +00:00
Sophie Zheng
5a8764a6a7
Merge "NDK api code coverage" am: 34fe2651ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181
Change-Id: I5a3897414e6237e02c69cf1bf68014b338e2b5c4
2020-06-18 19:46:14 +00:00
Paul Duffin
e5fc8fdf5e
Merge "Fail check-boot-jars if boot jar contains 0 .class files"
2020-06-18 19:35:22 +00:00
Sophie Zheng
34fe2651ed
Merge "NDK api code coverage"
2020-06-18 19:26:00 +00:00
Treehugger Robot
5aff46a439
Merge "Remove use of metalava compatible output" am: efc6dfb703
am: 31dff639b1
am: 046d37d84f
am: 8a24baef7b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1324659
Change-Id: Idcf19623b5704825cfe71ab3f2f7b7bfcb9ee827
2020-06-18 18:57:31 +00:00
Treehugger Robot
8a24baef7b
Merge "Remove use of metalava compatible output" am: efc6dfb703
am: 31dff639b1
am: 046d37d84f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1324659
Change-Id: I99659829862907c783ccadca5521f587dd3dc721
2020-06-18 18:38:44 +00:00
Treehugger Robot
046d37d84f
Merge "Remove use of metalava compatible output" am: efc6dfb703
am: 31dff639b1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1324659
Change-Id: Ibf3f2d7efd1d054970a6ea43e66b08291f00d753
2020-06-18 18:24:29 +00:00
Treehugger Robot
31dff639b1
Merge "Remove use of metalava compatible output" am: efc6dfb703
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1324659
Change-Id: I5bc25f60f42a9358545992805a99737a07508afd
2020-06-18 18:10:30 +00:00
Treehugger Robot
efc6dfb703
Merge "Remove use of metalava compatible output"
2020-06-18 17:57:05 +00:00
TreeHugger Robot
96101772c2
[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
-s ours am: e23e126d40
-s ours am: 22ab70c511
-s ours
...
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 03a29a6974
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: I5b40ab71e197b545a8dc85b9505149a0aad0a887
2020-06-18 16:24:14 +00:00
TreeHugger Robot
18f143dbc7
[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
am: eb0aebcffb
-s ours am: 9f95300785
-s ours
...
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 03a29a6974
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Icc8f07fb8db4e39aa2d83853e15210231925c5b1
2020-06-18 16:23:28 +00:00
TreeHugger Robot
3b9d1ef1cc
[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
am: eb0aebcffb
am: 8181ac26ac
-s ours
...
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 f8475cc49f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Iaab28c4879ac7eef0a9e1c4f9a7fecc92b2b998f
2020-06-18 16:23:02 +00:00
TreeHugger Robot
22ab70c511
[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
-s ours am: e23e126d40
-s ours
...
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 03a29a6974
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: I6d3adf7c32e8c509c8c2acc2cbc2773013b6beea
2020-06-18 16:05:21 +00:00
TreeHugger Robot
8181ac26ac
Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
am: eb0aebcffb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Id4670dba528e377a2fab8b2dded119255d0783ad
2020-06-18 16:04:58 +00:00
TreeHugger Robot
9f95300785
[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
am: eb0aebcffb
-s ours
...
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 f8475cc49f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Ib99dd74be50c63016dbd106dac79e154cf984e09
2020-06-18 16:04:25 +00:00
TreeHugger Robot
eb0aebcffb
Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Id1e7b856f8c3a645faba8d2af88fe28e8631a891
2020-06-18 15:49:08 +00:00
TreeHugger Robot
e23e126d40
[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
-s ours
...
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 f8475cc49f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Ifac2661928090fc166329588c70ad89d2f2f9ded
2020-06-18 15:48:25 +00:00
TreeHugger Robot
aec1debc65
Merge "Skip mount /oem on GSI" into rvc-dev
2020-06-18 15:32:41 +00:00
Paul Duffin
70dd47f0df
Fail check-boot-jars if boot jar contains 0 .class files
...
Protect against an invalid boot jar, e.g. one containing .dex files is
used instead of .class files.
Test: add a prebuilt for framework-tethering
Run `m check-boot-jars` with the first fix from
https://r.android.com/1341756 and the build fails due to no
.class files because a dex jar is used.
Run `m check-boot-jars` with all fixeds from
https://r.android.com/1341756 and the build works.
Bug: 158304459
Bug: 159112414
Merged-In: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
(cherry picked from 92d41de8f2
)
2020-06-18 14:17:57 +00:00