Commit graph

60172 commits

Author SHA1 Message Date
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
aec1debc65 Merge "Skip mount /oem on GSI" into rvc-dev 2020-06-18 15:32:41 +00:00
Paul Duffin
de3452fce2 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5 am: 9f58d77268
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: Iaefa8978cc068a95bb3d6dc5a9aa7cae45c23a5d
2020-06-18 12:51:46 +00:00
Paul Duffin
9f58d77268 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I7b0884a337f3842dad52cdaff17797c6100eccb2
2020-06-18 12:30:09 +00:00
Paul Duffin
c5fd7066f5 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev 2020-06-18 12:16:47 +00:00
Jeongik Cha
9917520fc2 notice files in system_other becomes included in system's one
system_other is relevant partition to system over vendor.
so move notice files from system_other from vendor to system

Bug: 159189171
Test: m nothing && check ninja dependency
Change-Id: Ib69bd3faae03f174671d5db8366a59b7d28a9d9d
2020-06-18 20:44:51 +09:00
Jing-yan, Jang
b74357aab7 Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec am: 08ab3caa0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: Id672a9ecc14d58822346e9ea6cb00fa8dfdb087e
2020-06-18 06:57:24 +00:00
Jing-yan, Jang
08ab3caa0c Merge "Identity: Add credstore" into rvc-dev am: dd592d87ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11736599

Change-Id: I65b41cb1fc9f933cc2e909d0b6256ad71d56c8c8
2020-06-18 06:52:50 +00:00
Jing-yan, Jang
dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
TreeHugger Robot
0e868862c3 Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c am: 4763cf420d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ia00cd67fac94a523030d6ddd4ca3f27d7c57e73e
2020-06-17 21:14:13 +00:00
TreeHugger Robot
4763cf420d Merge "Remove ANGLE from base_system.mk" into rvc-dev am: ddca499c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11897778

Change-Id: Ic413b355c44381b8d386f91492a538f835850216
2020-06-17 21:01:05 +00:00
TreeHugger Robot
ddca499c5c Merge "Remove ANGLE from base_system.mk" into rvc-dev 2020-06-17 20:34:06 +00:00
Tim Van Patten
25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
TreeHugger Robot
fbe754fcf1 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317 am: 9f24742ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: Id3671e3048a6b059d404861297327b405f2f4738
2020-06-17 18:16:49 +00:00
TreeHugger Robot
9f24742ee3 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev am: f854cf8317
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895387

Change-Id: If454a182b9e5b13b6704376d65fb7eeb8c724504
2020-06-17 18:02:30 +00:00
TreeHugger Robot
f854cf8317 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev 2020-06-17 17:51:25 +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
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
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
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
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
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
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
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
josephjang
f829b2bc9f Identity: Add credstore
In order to support mDL on RVC, we need to
add credstore in /system/bin

Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
2020-06-16 14:04:00 +00:00
Colin Cross
be74a37f2c Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 am: f24ee30bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857304

Change-Id: I4737e85175bfb1de89c35272c27ab3ff3d446751
2020-06-16 03:59:25 +00:00
Colin Cross
0ec6a1e77c Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b am: bf3825b927
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857303

Change-Id: Ibb6a90f0d770954e543623e161acc4b06ff447db
2020-06-16 03:58:44 +00:00
Colin Cross
f24ee30bc8 Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857304

Change-Id: I574f32f6061129b2c8b3c52f34f54a0600682331
2020-06-16 03:44:54 +00:00
Colin Cross
bf3825b927 Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857303

Change-Id: I48d751fe940c208dd151d032927050a258bf47ef
2020-06-16 03:43:26 +00:00
Colin Cross
7244e60105 Merge "Use inclusive language in build/make" into rvc-dev 2020-06-16 03:28:15 +00:00
Colin Cross
2be0200a8b Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev 2020-06-16 03:27:32 +00:00
Roopesh Nataraja
1908f97319 Include image descriptor of only the first boot image in vbmeta
Multiple boot images can be generated based on BOARD_KERNEL_BINARIES
but vbmeta would capture the image descriptor of only the first boot
image specified in BUILT_BOOTIMAGE_TARGET.

Bug : 158213759
Test: Compile multiple boot images and check if vbmeta.img
      includes image descriptor of only the first boot image
      specified in BUILT_BOOTIMAGE_TARGET

Change-Id: Ib70f65d98546a436da82656bc5c911d437618bb5
Merged-In: Ib70f65d98546a436da82656bc5c911d437618bb5
2020-06-15 17:10:56 -07:00
TreeHugger Robot
71c7831782 Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb am: bfa51c085e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11835428

Change-Id: I056d23fac21b2f9761cbd3c6a49770411ab36bd5
2020-06-15 17:18:45 +00:00
TreeHugger Robot
bfa51c085e Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11835428

Change-Id: I99532f4b31364453b68850a32b24ca632781bf06
2020-06-15 16:58:52 +00:00
TreeHugger Robot
2e2cb808cb Merge "Add test config template for sh_test." into rvc-dev 2020-06-15 16:37:06 +00:00
Tianjie
17f6ed8b04 Fix the read on a closed zipfile
When calculating the dynamic fingerprints, we need to reopen the
input file if it's a ZipFile. Because the original object has been
closed, as its scope ends after the with statement.

Bug: 152167826
Test: generate an OTA package with zip input and overrides
Change-Id: I623da3cc5fcc91c6230fb5a6e86517ed995913b7
(cherry picked from commit eb06afb602)
2020-06-13 14:35:14 -07:00
Colin Cross
a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
Colin Cross
3cd4a076ba Add out/soong/late-${TARGET_PRODUCT}.mk
Read out/soong/late-${TARGET_PRODUCT}.mk after reading Android.mk files
to allow Soong's makevars singleton to use $(call dist-for-goals).

Bug: 153485543
Test: m lint-check dist
Change-Id: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
Merged-In: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
(cherry picked from commit 8ca4092ab4)
2020-06-12 21:07:51 -07:00
Dan Willemsen
a3ec21b896 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1 am: c5862f0a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: Ic4e423b578e13228c8b42a11e733137350836246
2020-06-13 04:01:34 +00:00
Dan Willemsen
c5862f0a34 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET am: 458af2daa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11853804

Change-Id: I0968f23fc8491c1a40e869351af98923745a7646
2020-06-13 03:47:09 +00:00
Dan Willemsen
458af2daa1 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET
Instead of copying the logic (which led to divergences), use the
same list of dependencies for both users of build-recoveryimage-target

Bug: 158774198
Test: treehugger
Test: build-coral.ninja is the same before/after
Change-Id: I8f8c006432f3b8120df1f39c98009155fdff32ad
Merged-In: I8f8c006432f3b8120df1f39c98009155fdff32ad
(cherry picked from commit d120ac68fa)
2020-06-12 12:26:37 -07:00
TreeHugger Robot
ce826918e0 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265 am: 1a2d190613
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: I14827759be7fafee1cd92f4923b53f9530ad6574
2020-06-11 23:03:12 +00:00
frankfeng
e56f07725b Add test config template for sh_test.
Verification of compatibility with existing sh_test targets is in progress.

Bug: 148805488
Bug: 151761373

Test: make
Test: unit tests
Test: verified test config auto-gen for bc-tests and toybox-tests
Change-Id: Id8ce5dd0723e8c95921e2e20bff72fc828d47d87
Merged-In: Id8ce5dd0723e8c95921e2e20bff72fc828d47d87
2020-06-11 22:57:48 +00:00
TreeHugger Robot
1a2d190613 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev am: 0ffb2a8265
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11791946

Change-Id: I40fc0f8e247cf929bfff41f6dcb5977e224b7978
2020-06-11 22:43:51 +00:00
TreeHugger Robot
0ffb2a8265 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev 2020-06-11 22:31:22 +00:00