Martin Stjernholm
34012c5e06
Merge "Propagate TARGET_BUILD_APPS to Soong." am: 2c38eb2537
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1336406
Change-Id: I5f3c1a3b05b213fa71ce0aca1368712d32e1b965
2020-06-17 17:43:07 +00:00
Sophie Zheng
fbfb207232
Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b
am: a38bfeab4e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765
Change-Id: I23f88fcd3b1f8e5f13b01a9ca37629c96308e623
2020-06-17 17:42:54 +00:00
Martin Stjernholm
2c38eb2537
Merge "Propagate TARGET_BUILD_APPS to Soong."
2020-06-17 17:31:24 +00:00
Sophie Zheng
a38bfeab4e
Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765
Change-Id: If764d1dbfd02585f94249a5f16f010b667e040b6
2020-06-17 17:26:23 +00:00
Sophie Zheng
b5bfbab22b
Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."""
2020-06-17 17:11:32 +00:00
Paul Duffin
92d41de8f2
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
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
2020-06-17 17:38:24 +01:00
Steve Muckle
a6da7bc44a
enable LZ4 ramdisks for aosp_arm64
...
LZ4 is much faster to decompress than gzip.
Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-06-17 09:00:51 -07:00
SzuWei Lin
03a29a6974
Skip mount /oem on GSI
...
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.
Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f
)
2020-06-17 18:18:20 +08:00
Treehugger Robot
15b24b7119
Merge "Skip mount /oem on GSI" am: 03db4fbbb7
am: f775227f30
am: 7e0ddb1e59
am: d43e943372
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103
Change-Id: I87f71aa0de7a55c12e1c0c6691804b49259d8232
2020-06-17 09:33:13 +00:00
Treehugger Robot
d43e943372
Merge "Skip mount /oem on GSI" am: 03db4fbbb7
am: f775227f30
am: 7e0ddb1e59
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103
Change-Id: I63cd0ac7e8cf0d0a9e75e0f56d8ba120c1e84895
2020-06-17 09:14:49 +00:00
Treehugger Robot
7e0ddb1e59
Merge "Skip mount /oem on GSI" am: 03db4fbbb7
am: f775227f30
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103
Change-Id: Id7dcfff53ea7635ffc142b37fe25dfdc408c82c1
2020-06-17 08:55:48 +00:00
Treehugger Robot
f775227f30
Merge "Skip mount /oem on GSI" am: 03db4fbbb7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103
Change-Id: I628f251c537a32521fc503189ecf7d7ed3f16a4a
2020-06-17 08:38:00 +00:00
Treehugger Robot
03db4fbbb7
Merge "Skip mount /oem on GSI"
2020-06-17 08:21:23 +00:00
Automerger Merge Worker
416a104e1c
Merge "Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 7ecd0ed3e1
am: 1f474a0511" into rvc-qpr-dev-plus-aosp
2020-06-17 03:50:50 +00:00
TreeHugger Robot
e2b4420bb9
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 61802a76d1
am: 05541b40e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: I3d1eab120abb7a773e2c017c68d3192c020c79af
2020-06-17 03:50:45 +00:00
TreeHugger Robot
fb216493fe
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 7ecd0ed3e1
am: 1f474a0511
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: I2553174ab137f0d755182f8a2d1f2340193f1128
2020-06-17 03:50:45 +00:00
TreeHugger Robot
538e7cdc3d
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 7ecd0ed3e1
am: 2b3d6e0470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: I134ca858abd6eb2805b8d4833f30c418bd99a47d
2020-06-17 03:50:33 +00:00
TreeHugger Robot
05541b40e2
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 61802a76d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: I7e0e8d35b69686ed91c55493c0ef123b60ee0f4f
2020-06-17 03:33:06 +00:00
TreeHugger Robot
1f474a0511
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 7ecd0ed3e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: Ie3c98c9c66f5e2e0772dc265f1352983cb2b6839
2020-06-17 03:33:05 +00:00
TreeHugger Robot
2b3d6e0470
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
am: 7ecd0ed3e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: Id7930af5150907be492043aab4a2b794d9328e11
2020-06-17 03:32:44 +00:00
Martin Stjernholm
74920e6e43
Propagate TARGET_BUILD_APPS to Soong.
...
Used to select SDK variants of native libraries when building unbundled
apps only. This allows unbundled modules to access the platform
variants (and typically their versioned APEX stubs).
Test: m (on AOSP master)
Test: TH (including ub-launcher3-master)
Bug: 157549171
Change-Id: I74f0bcebe8b66b81b2c80e9d448f5d24dc9ab991
2020-06-17 04:15:00 +01:00
TreeHugger Robot
61802a76d1
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: Ie30dc40aafa47cfba1fae7376a7bdbd295afac66
2020-06-17 03:11:04 +00:00
TreeHugger Robot
7ecd0ed3e1
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev am: d9673e768a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11887882
Change-Id: If74b44c6085663208fc33bbdc64c1cc20a5bdb28
2020-06-17 03:11:00 +00:00
TreeHugger Robot
d9673e768a
Merge "add 4.19 kernel to aosp_arm64" into rvc-dev
2020-06-17 02:58:06 +00:00
Treehugger Robot
9630e3b0ee
Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271
am: e2e3df64b0
am: bc09fa8b55
am: 6f52047eeb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241
Change-Id: I3d91266cb83f1a33de3f5c36e38d690b43894fb9
2020-06-17 02:33:21 +00:00
Treehugger Robot
6f52047eeb
Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271
am: e2e3df64b0
am: bc09fa8b55
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241
Change-Id: I723f74d659cc2a3da03f5e1338057c9208bc7eb3
2020-06-17 02:14:51 +00:00
Treehugger Robot
bc09fa8b55
Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271
am: e2e3df64b0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241
Change-Id: I5df51f8ed927f618c3b0d5f9eb70a592a91ab23b
2020-06-17 01:57:44 +00:00
Treehugger Robot
e2e3df64b0
Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241
Change-Id: I2d58399908c706496ae841db5648e644c8a8730e
2020-06-17 01:40:41 +00:00
Automerger Merge Worker
dd4daea1c2
Merge "[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
-s ours am: 4029e98571
-s ours am: f440816896
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-17 01:33:44 +00:00
TreeHugger Robot
1cd71b5435
[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
-s ours am: 4029e98571
-s ours am: f440816896
-s ours
...
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 1908f97319
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I9e02f4d8882dd3aabd3a53b3dab3f29979ea35c9
2020-06-17 01:33:39 +00:00
TreeHugger Robot
db8bc50222
[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
am: cb83530f3c
am: bbd972ffc9
-s ours
...
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 1908f97319
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I6fe93f6117df9d5d74f553712bcb62890f021a53
2020-06-17 01:33:38 +00:00
TreeHugger Robot
e6b4f6c16b
[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
am: cb83530f3c
-s ours am: 132b74040f
-s ours
...
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 3e15f6edb1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I67df4e24562840101976f8c652d097abd986863d
2020-06-17 01:33:21 +00:00
Treehugger Robot
0c263fd271
Merge "Refactor how MODULES-IN-* is defined"
2020-06-17 01:26:20 +00:00
TreeHugger Robot
f440816896
[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
-s ours am: 4029e98571
-s ours
...
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 1908f97319
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I8986c51432fa818ecf3b7fd96519f9af29d88321
2020-06-17 01:14:31 +00:00
TreeHugger Robot
132b74040f
[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
am: cb83530f3c
-s ours
...
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 3e15f6edb1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: Icc1c243bae0418bf646899f9d41c1232001db809
2020-06-17 01:14:22 +00:00
TreeHugger Robot
bbd972ffc9
Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
am: cb83530f3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I37651feadafb140ae2b42789a62eb5486df56281
2020-06-17 01:14:20 +00:00
Colin Cross
74f121d18f
Rename Native_coverage to GcovCoverage in Soong
...
Pass the NATIVE_COVERAGE Make variable to Soong as the more accurate
GcovCoverage. Also remove NATIVE_LINE_COVERAGE, it doesn't do anything
different from NATIVE_COVERAGE, and NATIVE_COVERAGE is always set when
NATIVE_LINE_COVERAGE is set.
Bug: 159059537
Test: m checkbuild
Change-Id: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
2020-06-16 18:01:52 -07:00
TreeHugger Robot
cb83530f3c
Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: Ibb8c9e5542aeb6d491ac8324f3feabe698649c1b
2020-06-17 01:00:09 +00:00
TreeHugger Robot
4029e98571
[automerger skipped] Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev am: 6df396f96f
-s ours
...
am skip reason: Change-Id Ib70f65d98546a436da82656bc5c911d437618bb5 with SHA-1 3e15f6edb1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11875347
Change-Id: I46c45801d206fd48f6643563499a8bc69fc19f7b
2020-06-17 00:59:48 +00:00
Tianjie Xu
b4f4c19665
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
am: 5465eff6ff
am: 013a82bbd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: Iee25bf669241d10e5d74bfd2a507a0f10cd33e16
2020-06-17 00:55:07 +00:00
Tianjie Xu
35b155e64f
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
am: 16db047f9e
am: 89bec0265f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: I98ee9432d205d90ad8a23ec542e42d93e673beef
2020-06-17 00:53:55 +00:00
Tianjie Xu
28b50cfe03
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
am: 16db047f9e
am: 085edb240a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: I94a8fc9061f2177d62b9aaa4041eca05013a14da
2020-06-17 00:53:42 +00:00
Steve Muckle
9c4a0ea67f
add 4.19 kernel to aosp_arm64
...
Create a 4.19 kernel GKI boot image.
Bug: 158791155
Change-Id: I2dcfe29f2e8414c0362992a6e6ca68a86f367d4e
2020-06-16 17:49:18 -07:00
TreeHugger Robot
6df396f96f
Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev
2020-06-17 00:46:40 +00:00
Tianjie Xu
013a82bbd3
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
am: 5465eff6ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: I0f84c3dc184cbb5658571b5de9c344b1a617ff83
2020-06-17 00:38:55 +00:00
Tianjie Xu
085edb240a
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
am: 16db047f9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: I27b8cd02210f0523fdffa67df7c4264b50200b44
2020-06-17 00:37:49 +00:00
Tianjie Xu
89bec0265f
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
am: 16db047f9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: Iad2f8eda2602f805b897d36173be39c5000e31cc
2020-06-17 00:37:46 +00:00
Tianjie Xu
5465eff6ff
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: I045247c6c50628bd161445b557abe379c480da7a
2020-06-17 00:18:53 +00:00
Tianjie Xu
16db047f9e
Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314
Change-Id: I4111bdee72e6fd9ac36000f9f217e178ed21b1ae
2020-06-17 00:18:39 +00:00
Tianjie Xu
21c7d8c5c6
Merge "Fix the read on a closed zipfile" into rvc-dev
2020-06-17 00:02:53 +00:00