Commit graph

66300 commits

Author SHA1 Message Date
David Anderson
0095342759 Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6 am: f32cb7f738
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055

Change-Id: I35a31aba6436fe4c8fa71c063d180e5a129df9ed
2020-11-23 22:19:41 +00:00
David Anderson
f32cb7f738 Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055

Change-Id: Id1b6b561cd174fb8dc037e7290e4fc3ccee4e54e
2020-11-23 21:38:07 +00:00
David Anderson
01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +00:00
Kelvin Zhang
cecff2abb7 Merge "Add --disable_verity_computation option to ota script" am: 788055c00b am: c2fbbbe61f
Original change: https://android-review.googlesource.com/c/platform/build/+/1506878

Change-Id: Icc2f92737e356a3233961785f3ee4b63029534fa
2020-11-23 21:06:38 +00:00
Treehugger Robot
d589c50767 Merge "Add installed-files-vendor-ramdisk.txt" am: 1393da036e am: a0ceb3c124
Original change: https://android-review.googlesource.com/c/platform/build/+/1507726

Change-Id: I188a3eb0b8da3cc92e5d01abf391fb7a724ad1f8
2020-11-23 21:05:40 +00:00
Kelvin Zhang
c2fbbbe61f Merge "Add --disable_verity_computation option to ota script" am: 788055c00b
Original change: https://android-review.googlesource.com/c/platform/build/+/1506878

Change-Id: I44c3663dab538a2a5a0e48d448fd57862ddf03ff
2020-11-23 20:20:09 +00:00
Treehugger Robot
a0ceb3c124 Merge "Add installed-files-vendor-ramdisk.txt" am: 1393da036e
Original change: https://android-review.googlesource.com/c/platform/build/+/1507726

Change-Id: Iec5ec53fc94bc53a3ed2d5d475cffa440accaff7
2020-11-23 20:19:49 +00:00
Kelvin Zhang
788055c00b Merge "Add --disable_verity_computation option to ota script" 2020-11-23 19:43:24 +00:00
Treehugger Robot
1393da036e Merge "Add installed-files-vendor-ramdisk.txt" 2020-11-23 19:35:00 +00:00
Kelvin Zhang
caf7bbc39e Add --disable_verity_computation option to ota script
Test: treehugger, generate an OTA with --disable_verity_computation, serve it to
VABC device. Make sure it works

Change-Id: I0a5f3c018727cb3eed3edd004d60d09d13e34039
2020-11-23 13:24:34 -05:00
Petri Gynther
6ff5201ce9 Add installed-files-vendor-ramdisk.txt
Add installed-files-vendor-ramdisk.txt build artifact, so that it is
easy to see what files landed on the vendor ramdisk.

Test: clean build, inspect installed-files-vendor-ramdisk.txt
Change-Id: Ie84d06dc968ad972ab2bfa79db4d1839ba09e09f
2020-11-20 16:59:57 -08:00
Daniel Norman
31e20aa221 Merge "Adds a new build task to run host_init_verifier on partition dirs." am: 97332c9685 am: 36a743c33d
Original change: https://android-review.googlesource.com/c/platform/build/+/1495141

Change-Id: I63ac1f6f326ee1272756533c7dd69286b065c4a2
2020-11-20 19:48:09 +00:00
Daniel Norman
36a743c33d Merge "Adds a new build task to run host_init_verifier on partition dirs." am: 97332c9685
Original change: https://android-review.googlesource.com/c/platform/build/+/1495141

Change-Id: I2d00971acd70f722dad55fbf572865fddcbc8e8d
2020-11-20 19:29:04 +00:00
Daniel Norman
97332c9685 Merge "Adds a new build task to run host_init_verifier on partition dirs." 2020-11-20 18:57:17 +00:00
Treehugger Robot
bbebe256e7 Merge "Turns on building vbmeta.img when merging if avb_enable=true." am: adcf94d5b7 am: b89394908f am: 1d64807ad2
Original change: https://android-review.googlesource.com/c/platform/build/+/1506497

Change-Id: I6670c7acd654f9d8203bb247657b46cb34498028
2020-11-20 06:58:37 +00:00
Treehugger Robot
6ed98bf289 Merge "Mark PRODUCT_xxx variables as single item instead of list" am: ca3faad9f2 am: 6043d1f373 am: a78b21a6f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1496640

Change-Id: I69fb19d8baee1eaeced577e4860778ef014ca85a
2020-11-20 06:58:17 +00:00
Treehugger Robot
1d64807ad2 Merge "Turns on building vbmeta.img when merging if avb_enable=true." am: adcf94d5b7 am: b89394908f
Original change: https://android-review.googlesource.com/c/platform/build/+/1506497

Change-Id: Ib1f55353b139858f072174d095b54ee852c1a874
2020-11-20 06:30:05 +00:00
Treehugger Robot
a78b21a6f5 Merge "Mark PRODUCT_xxx variables as single item instead of list" am: ca3faad9f2 am: 6043d1f373
Original change: https://android-review.googlesource.com/c/platform/build/+/1496640

Change-Id: I220d63de7a4dadc99b92162f329029f6d24de2a6
2020-11-20 06:29:39 +00:00
Treehugger Robot
b89394908f Merge "Turns on building vbmeta.img when merging if avb_enable=true." am: adcf94d5b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1506497

Change-Id: I54555f9efc50f335b3af3d1d55243ca86ac34627
2020-11-20 06:22:15 +00:00
Treehugger Robot
adcf94d5b7 Merge "Turns on building vbmeta.img when merging if avb_enable=true." 2020-11-20 06:18:34 +00:00
Treehugger Robot
6043d1f373 Merge "Mark PRODUCT_xxx variables as single item instead of list" am: ca3faad9f2
Original change: https://android-review.googlesource.com/c/platform/build/+/1496640

Change-Id: Iba5603e5ee642f16553aef680192af23c4767b74
2020-11-20 06:15:12 +00:00
Treehugger Robot
ca3faad9f2 Merge "Mark PRODUCT_xxx variables as single item instead of list" 2020-11-20 06:00:36 +00:00
Bo Hu
a5cf995bdc Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1 am: a084e1bf83 am: e1a86fedc0
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: I9cde12bb589f4ef855e5d7aacd8ab606e3182b39
2020-11-20 04:07:29 +00:00
Bo Hu
e1a86fedc0 Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1 am: a084e1bf83
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: Ica00df7f3b8d62470311ce4020f799a52f3dcd80
2020-11-20 03:21:22 +00:00
Bo Hu
a084e1bf83 Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: Ieb2494407b4f6d1ccc2cf8cf2ba33167d90f6ac9
2020-11-20 02:37:48 +00:00
Julien Desprez
bcb1a195e9 Merge "Add a template for java host unit tests" am: 0137f2d940 am: df41afd42a am: 189cdaa795
Original change: https://android-review.googlesource.com/c/platform/build/+/1505112

Change-Id: I6d7310ec891222bf5ed9c5bc4ce2cc014d030e7b
2020-11-20 02:31:43 +00:00
Treehugger Robot
e4fa02b341 Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc am: d6b56ebb57 am: 9be500f3e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I6278d2dc2f730dc87cd0e4897c7a333d81a3cb38
2020-11-20 02:29:48 +00:00
Bo Hu
1816caecf1 Merge "emulator: enable cfi for emulator's wifi driver" 2020-11-20 02:17:44 +00:00
Julien Desprez
189cdaa795 Merge "Add a template for java host unit tests" am: 0137f2d940 am: df41afd42a
Original change: https://android-review.googlesource.com/c/platform/build/+/1505112

Change-Id: I2a23089d7b9b03b9ea3f8da5246daa2b0bd1bcde
2020-11-20 02:07:44 +00:00
Treehugger Robot
9be500f3e1 Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc am: d6b56ebb57
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I2233d95a50a198c014507aed6e57c9d0bb9a71d7
2020-11-20 02:05:22 +00:00
Julien Desprez
df41afd42a Merge "Add a template for java host unit tests" am: 0137f2d940
Original change: https://android-review.googlesource.com/c/platform/build/+/1505112

Change-Id: I14c33ff657d384cd36a3649f0f395579b1207b93
2020-11-20 01:20:28 +00:00
Treehugger Robot
d6b56ebb57 Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I05ee2dc8b5a0d285f80a9c7729c23f8bdee2c260
2020-11-20 01:12:10 +00:00
Julien Desprez
0137f2d940 Merge "Add a template for java host unit tests" 2020-11-20 00:07:41 +00:00
Treehugger Robot
3ccf730cdc Merge "Use 'inherit-product/inherit-product-if-exists to include config files" 2020-11-19 23:54:27 +00:00
Daniel Norman
38888d390f Turns on building vbmeta.img when merging if avb_enable=true.
Needed after commit 8218225794
which skips regenerating vbmeta.img if avb_building_vbmeta_image!=true.
Partial builds that disable vbmeta generation do not set this field.

Bug: 169892879
Test: Run merge_target_files.py on builds that have avb_enable=true but
      PRODUCT_BUILD_VBMETA_IMAGE=false. Observe vbmeta.img generation.
Change-Id: Id498dbd28c909e19cd35178b95a0b5dc22a1ac70
2020-11-19 14:51:15 -08:00
bohu
79106cd3ab emulator: enable cfi for emulator's wifi driver
Since the wpa_supplicant_8 has enabled cfi, the
static lib that it uses should enable cfi, otherwise
there will be runtime crashes.

BUG: 169343095
Test:
lunch sdk_phone_arm64-userdebug
m -j
run the image on the aarch64-linux host
hostapd_nohidl and wpa_supplicant should
not crash with cfi failures.

Change-Id: I00e3840032530ee62aac69cab0b54755f83291f9
2020-11-19 12:50:47 -08:00
Julien Desprez
0bb3fffd1a Add a template for java host unit tests
This will execute the host unit tests in isolation.

Test: make aoa-helper-test
Bug: 172961860
Change-Id: Icbbf7214d877bd2e65ac1b97bc299f7af7acdcfe
2020-11-19 09:42:41 -08:00
Treehugger Robot
80d87690a1 Merge "Clear LOCAL_IS_UNIT_TEST" am: ad33b891f8 am: 685f2038b4 am: 09dc62da36
Original change: https://android-review.googlesource.com/c/platform/build/+/1504096

Change-Id: Ide705eb4465963ce7eb86119ac567e7303a96d17
2020-11-19 08:22:40 +00:00
Treehugger Robot
09dc62da36 Merge "Clear LOCAL_IS_UNIT_TEST" am: ad33b891f8 am: 685f2038b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1504096

Change-Id: I58fe02f9328220d0b8f3fca993dad04cd0c6ddf9
2020-11-19 08:09:32 +00:00
Treehugger Robot
685f2038b4 Merge "Clear LOCAL_IS_UNIT_TEST" am: ad33b891f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1504096

Change-Id: I07f6f13faaeaba444d2f781e3102360905ededc6
2020-11-19 07:44:42 +00:00
Treehugger Robot
ad33b891f8 Merge "Clear LOCAL_IS_UNIT_TEST" 2020-11-19 07:16:29 +00:00
David Anderson
8820eaa5e5 Move snapuserd into the vendor ramdisk.
For devices that are GKI capable, including virtual_ab_ota_compression
will now include snapuserd in the vendor ramdisk.

For devices that are not GKI-capable (eg do not have vendor_boot),
virtual_ab_ota_compression_retrofit.mk must be included in addition to
virtual_ab_ota_compression.mk. This structure is to avoid needing a
large combination of different Makefiles.

Bug: 173463595
Test: manual test
Change-Id: Idc740d3523c2d166dd578cee41ea07d7eaf8edfa
2020-11-18 22:12:34 -08:00
Paul Scovanner
fa7b5dda56 [automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf am: 39768724db -s ours am: b2fe374548 -s ours am: c1b6196a2c -s ours am: 8951d1fdb8 -s ours
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: If863ae8fae22f66e97e60bfd92e83e3082f9ce5f
2020-11-19 02:43:37 +00:00
Paul Scovanner
314561e81a [automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf am: 39768724db -s ours am: b2fe374548 -s ours am: c1b6196a2c -s ours am: 4005b08b7c -s ours
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: Icebb2b9c0169d5e9e4c7f07e8e159195b8d436d3
2020-11-19 02:43:27 +00:00
Paul Scovanner
8951d1fdb8 [automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf am: 39768724db -s ours am: b2fe374548 -s ours am: c1b6196a2c -s ours
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: Icf6df3192b1d5cc1180ec76c7d241ce49942cad7
2020-11-19 02:25:45 +00:00
Paul Scovanner
4005b08b7c [automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf am: 39768724db -s ours am: b2fe374548 -s ours am: c1b6196a2c -s ours
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: I33065caaafff643e5fb4f33b071c41819f7b4761
2020-11-19 02:25:22 +00:00
Paul Scovanner
c1b6196a2c [automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf am: 39768724db -s ours am: b2fe374548 -s ours
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: I7e59d0eaa9d91b21045f4908cd56a94fbcc990f0
2020-11-19 02:08:33 +00:00
Paul Scovanner
b2fe374548 [automerger skipped] Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf am: 39768724db -s ours
am skip reason: Change-Id I273073a04d6981c5a58b3aebdf13249fdb46586e with SHA-1 643b264940 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: I5eb8a86918aec64ae8f46d04e507827c7816d6af
2020-11-19 01:14:43 +00:00
Paul Scovanner
39768724db Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471 am: e4ca3c2ecf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: I3ae8240a83bf652ab60d3b32d94065be36b1121b
2020-11-19 00:59:59 +00:00
Paul Scovanner
e4ca3c2ecf Update Security String to 2021-01-01 am: 6441bc7ca3 am: cc0c1b00b6 am: 0f0c87eab7 am: e414401471
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13074489

Change-Id: I5c255d9e92050a94aebe9d12601afc98c19662ae
2020-11-19 00:37:59 +00:00