Commit Graph

64269 Commits

Author SHA1 Message Date
Yifan Hong 1564782378 Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256

Change-Id: I0778b96d661d597d6bd3b0421e7ff11f3ded0e1f
2020-11-13 00:23:08 +00:00
Yifan Hong f07ceb45b2 Merge "aosp_arm64 Copy boot image from $OUT to target files" 2020-11-12 23:50:06 +00:00
Yifan Hong bc685f920c Revert "Mount generic ramdisk as readwrite."
This reverts commit 78b55b2244.

Reason for revert: Replaced by Ib99aca13d4d:
ANDROID: GKI: build in a kernel command line of "rw"

Prebuilt is checked in at Ie34b5b017:
Update kernel to builds 6964541

Fixes: 171512004
Test: TH

Change-Id: I2aec88cc22483a6b3a671fc664d465624a14e5b0
2020-11-12 20:06:54 +00:00
Alexander Mishkovets 5a6bc22b52 Fix the order of loading OEM properties
Move the OEM property imports so that they take higher precedence over
product and can still be overridden by factory properties.

Bug: 171304788
Test: manual
Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-12 13:13:15 +00:00
Fabien Sanglard a720635be2 Fix zipalign alignment error
Problem: Zipalign operates over several false assumptions. First it
assumes that zip entries are in the same order in the body and in
the Central Direcotry. Second, it assumes there are not space
between entries. This makes alignment incorrect when these asserts
are not true.

Solution: Don't align entries by tracking bias based on input zip
entry location. Calculate the expected alignment based on the out-
put zip file and correct with extra padding.

Fixes: 162117652
Test: Units Tests
Change-Id: Ia179338f658cab18a377cba2c7c8e629089a2785
2020-11-11 17:00:22 -08:00
Fabien Sanglard 4b4b495d88 Improve Zipalign test
Problem: Zipalign test invokes process but not verify.
Solution: Invoke both during test.

Test: Unit Test
Bug: NA
Change-Id: If603df301048f4b508e3429c4a8c77339ab351ae
2020-11-11 16:50:18 -08:00
Hridya Valsaraju cfd80b3a6e Add libdmabufheap to VNDK SP list
Test: make
Bug: 154310076
Change-Id: I0ec2bce1a6636ac332c7dee370173a727d9d013b
2020-11-11 16:31:31 -08:00
Kelvin Zhang 5a65f69ae6 Dump BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST into misc_info.txt
Cuttlefish doesn't support updating the vendor partition. So we change
ota_from_target_files to only generate updates for partitions in
BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST. This CL puts the prop in
misc_info.txt, which will be read by ota scrips

Bug: 171999375
Test: mm -j
Change-Id: I4d9c97c717cb73806f95684b3bc81ef285ccbb8b
2020-11-11 14:23:00 -05:00
Kelvin Zhang 6cdf39168f Allow downgradeable secondary payload
Test: treehugger
Bug: 172811557
Change-Id: I58f3123b9bc69342427f95250a5ee57ede4ac926
2020-11-11 14:23:00 -05:00
Kelvin Zhang 83ea783146 Filter out ab_partitions in source_info as well
When generating a incremental partial OTA, we need to filter out
partitions in ab_partitions which are not in partial list

Test: Generate a partial incremental OTA
Change-Id: Iff7748ce6181a9a231557de0539004211587232c
2020-11-11 14:23:00 -05:00
Kelvin Zhang c54b57c93e Merge "Allow downgradable partial OTA" am: 6f83343e7e
Original change: https://android-review.googlesource.com/c/platform/build/+/1487677

Change-Id: I204faa6502fa078d7a22676d975c18a430fa383c
2020-11-11 14:24:02 +00:00
Kelvin Zhang 65029a2801 Include complete boot image on builds containing gki apex
Test: treehugger
Bug: 171906589
Change-Id: I231dac425ab14602492346006e331e4666173614
2020-11-11 09:16:32 -05:00
Kelvin Zhang 6f83343e7e Merge "Allow downgradable partial OTA" 2020-11-11 14:05:47 +00:00
Yo Chiang c81251e516 Merge "Fix missing required dependency caused by circular dependency" am: 544b5568db
Original change: https://android-review.googlesource.com/c/platform/build/+/1321320

Change-Id: Ib081dfb3b7ae8f755aaa6e87a76ab7e404159d9a
2020-11-11 04:00:44 +00:00
Yo Chiang 544b5568db Merge "Fix missing required dependency caused by circular dependency" 2020-11-11 03:43:56 +00:00
Palmer Dabbelt 2d691edf69 Add dmuserd to PRODUCT_PACKAGES_DEBUG
This is a simple dm-user daemon that will be used for the QA tests.

Test: manual, b/171749628
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: I37b78a1479f08f37fe7cff3f2e201dc6d8a6e584
2020-11-10 13:48:02 -08:00
Yifan Hong 49968aa137 aosp_arm64 Copy boot image from $OUT to target files
If BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES is defined,
in target files, instead of rebuilding the boot image, copy the boot
image already built in $OUT to target files package directly so that
they are the same package.

Define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES for aosp_arm64.

The GKI APEX is built using the boot image in $OUT. If the boot image in
$OUT is different from the boot image in target files, aka the generic
boot image we release, the GKI APEX we built is invalid.

If another device needs to copy $OUT/boot.img to target files, it can
define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES.

Fixes: 172682114
Test: lunch aosp_arm64 &&
Change-Id: I10fc7a5aa36e976dbeaf25434239687455bba061
2020-11-10 12:55:40 -08:00
Yifan Hong 89ff2885c5 Merge "Extract boot image from prebuilt apex" am: 4cecc43796
Original change: https://android-review.googlesource.com/c/platform/build/+/1471253

Change-Id: Ice2a2662a68a812d7105c1d07641d886e3d06060
2020-11-10 18:39:20 +00:00
Yifan Hong 4cecc43796 Merge "Extract boot image from prebuilt apex" 2020-11-10 17:45:06 +00:00
Kelvin Zhang 80195724e7 Allow downgradable partial OTA
Cuttlefish doesn't support updatin vendor partition. So in testing we
need to exclude vendor and generate a downgrade partial package.

Test: generate a partial downgrade OTA
Bug: 171999375
Change-Id: I97e450d4063320cf55003a7a5c5ef913c321e067
2020-11-10 09:11:20 -05:00
Treehugger Robot 83bbf90577 Merge "Add the janitors and someone from Studio." am: b65e0b7648
Original change: https://android-review.googlesource.com/c/platform/build/+/1492848

Change-Id: Ib615a0e27493e9ead01e75a056552f928230d4c6
2020-11-10 09:37:39 +00:00
Treehugger Robot b65e0b7648 Merge "Add the janitors and someone from Studio." 2020-11-10 08:55:31 +00:00
Yifan Hong 0674a6e04d Extract boot image from prebuilt apex
Test: m bootimage && file $OUT/boot.img
Bug: 169361394
Change-Id: Id88fd452be8bea82805bde81e407cf6b991120d0
2020-11-09 18:45:42 -08:00
Elliott Hughes 2acc9a4e8c Merge "Run zipalign tests in presubmit." am: 3fc740b7cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1489085

Change-Id: I5b210b0f057f537bdd386db5053515937c97e241
2020-11-10 01:09:10 +00:00
Elliott Hughes 3fc740b7cb Merge "Run zipalign tests in presubmit." 2020-11-10 00:19:31 +00:00
Elliott Hughes 3d8fb39b0e Add the janitors and someone from Studio.
Studio uses this too, not just the platform build.

Test: treehugger
Change-Id: I65c8a8f150e4d10ca31f67a816c9882d46f08ebf
2020-11-09 14:06:02 -08:00
Cole Faust aed3404c00 Merge "Make dump-many-vars work for large variables" am: a6fe413946
Original change: https://android-review.googlesource.com/c/platform/build/+/1486402

Change-Id: I2b3cda089a983eab0b418c8a76bbcf10a106800d
2020-11-09 19:30:01 +00:00
Cole Faust a6fe413946 Merge "Make dump-many-vars work for large variables" 2020-11-09 19:20:24 +00:00
Treehugger Robot 66e828f7ce Merge "Fix zipalign tests with GetExecutableDirectory" am: 7bd7db619a
Original change: https://android-review.googlesource.com/c/platform/build/+/1490353

Change-Id: If98deaae1a73328e36ac036468faed1878059d0c
2020-11-07 23:32:11 +00:00
Treehugger Robot 7bd7db619a Merge "Fix zipalign tests with GetExecutableDirectory" 2020-11-07 23:08:55 +00:00
Treehugger Robot 3534f7ea31 Merge "Create a new test zip for hostside unittest" am: 6ca8eef673
Original change: https://android-review.googlesource.com/c/platform/build/+/1484536

Change-Id: I76e82406fd87ef7c5b64b283782205151eaeafc5
2020-11-07 05:49:24 +00:00
Treehugger Robot 6ca8eef673 Merge "Create a new test zip for hostside unittest" 2020-11-07 04:53:10 +00:00
Cole Faust 2ce1fd907b Make dump-many-vars work for large variables
When printing a large variable like PRODUCT_PACKAGES,
dump-many-vars could fail because the command line is
too long. This is seen as a E2BIG error on the execve
in kati.

To solve this, split the printing up by word in the
variable.

Change-Id: I49db726d7a4769a2f02028194d79934ed5655adf
Fixes: 172287533
Test: lunch bonito-userdebug; get_build_var PRODUCT_PACKAGES
2020-11-07 01:38:20 +00:00
Fabien Sanglard 6dfc6fb4c4 Fix zipalign tests with GetExecutableDirectory
Test: Self-tested
Bug: NA
Change-Id: Idc15c0e028b74a2b38c26af0e7d4a51f32210145
2020-11-06 17:04:59 -08:00
David Anderson c0a5fefc1f Merge "Add snapuserd to VABC product and base_system.mk." am: 7cd99eb450
Original change: https://android-review.googlesource.com/c/platform/build/+/1464824

Change-Id: If271bfaa49bf76044ab4e3a878c43282d069ea1a
2020-11-06 23:37:08 +00:00
David Anderson 7cd99eb450 Merge "Add snapuserd to VABC product and base_system.mk." 2020-11-06 23:26:18 +00:00
Treehugger Robot 849591302b Merge "Checks for APK sharedUserIds that cross partition group boundaries." am: ba1811bf83
Original change: https://android-review.googlesource.com/c/platform/build/+/1480660

Change-Id: I76197312aadf243fd49c910a598f3527c9d554ba
2020-11-06 23:04:51 +00:00
Dan Shi 705d652767 Create a new test zip for hostside unittest
Bug: 172006742
Test: m
Change-Id: Idb82b508d3c49d19f1a76de4311bc0616e1ffa49
2020-11-06 23:00:11 +00:00
Treehugger Robot ba1811bf83 Merge "Checks for APK sharedUserIds that cross partition group boundaries." 2020-11-06 22:29:46 +00:00
Yifan Hong 38d4d432b7 Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086

Change-Id: I9a6e0ec38f90ed361a83edfff3fa3f0f4664b209
2020-11-06 19:27:44 +00:00
Yifan Hong 97c8455634 Merge "Install e2fsck_ramdisk to GKI ramdisk." 2020-11-06 19:17:15 +00:00
Yifan Hong 84ae75cd3c Install e2fsck_ramdisk to GKI ramdisk.
Test: build and inspect output
Bug: 172603832
Fixes: 171326057
Change-Id: If656efdea8a503dc837f23898a5f0ed56884eda4
2020-11-06 10:28:03 -08:00
Treehugger Robot e2aef95b2d Merge "Phase out Legacy GSI" am: a0aebc1081
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796

Change-Id: I86e6382b26dabef97873ff7a1f6bcee8c2ad2a3b
2020-11-06 04:19:30 +00:00
Treehugger Robot a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +00:00
Treehugger Robot acbf88c241 Merge "Add a rule to get numbers greater or equal to a minimum number." am: 354cafe42a
Original change: https://android-review.googlesource.com/c/platform/build/+/1480277

Change-Id: I15463a290650a67d4e4fb36a9f4ce2363ad9d5b7
2020-11-06 02:13:08 +00:00
Treehugger Robot 354cafe42a Merge "Add a rule to get numbers greater or equal to a minimum number." 2020-11-06 01:17:38 +00:00
Elliott Hughes c2039151ba Run zipalign tests in presubmit.
Test: treehugger
Change-Id: I2779c04313976d29c29c50920c0b356309c08439
2020-11-05 16:37:40 -08:00
Daniel Norman d33515623a Checks for APK sharedUserIds that cross partition group boundaries.
This check is used when merging target files to ensure that a merged
build does not contain any APKs that share UID across builds.

Bug: 171431774
Test: test_common
Test: Use merge_target_files.py to merge two partial builds,
      observe no failures for inputs without colliding APKs.
Test: Use merge_target_files.py to merge two partial builds,
      observe failure for inputs that have an APK that shares a
      UID across input partition groups.
Change-Id: I9dc57216882741ae46a99cfd7847f34702c75582
2020-11-05 15:17:05 -08:00
Treehugger Robot af00a45d17 Merge "Switch ramdisk.img to the LZ4 format" am: d41b82563f
Original change: https://android-review.googlesource.com/c/platform/build/+/1489080

Change-Id: Ibe691e3485a92530ff0aa33e5f04ccd00405dc51
2020-11-05 22:01:11 +00:00
Treehugger Robot d41b82563f Merge "Switch ramdisk.img to the LZ4 format" 2020-11-05 21:30:28 +00:00