Commit Graph

64215 Commits

Author SHA1 Message Date
Yifan Hong
b95d02eac9 Pass kernel release file to check_vintf.
check_vintf now accepts a file that contains the full kernel
release string as the first half of --kernel. Use it.

With this patch, BOARD_KERNEL_VERSION can be a full kernel release
string like 5.4.42-something, or 5.4.42-android12-0-something.

The content of target_files/META/kernel_version.txt also contains the
full kernel release, not just the kernel version.

Bug: 161317193
Test: m check-vintf-all
Change-Id: I3b52639f557532077894d9356c745c16b41dd91c
2020-11-13 18:45:03 -08:00
Yifan Hong
72e78f21b2 Pass kernel version file to check_vintf.
check_vintf now accept a path to a file that contains the kernel
version string. Use it.

Test: m check-vintf-all and manual inspect
Bug: 161317193
Change-Id: I4812c93f352686d73c5832d59e43a297d93e67a2
2020-11-13 18:45:03 -08:00
Treehugger Robot
8e00778fb6 Merge "Add libdmabufheap to VNDK SP list" 2020-11-14 01:25:09 +00:00
Jose Galmes
836b600594 Support for recovery snapshot.
Bug: 171231437
Test: source build/envsetup.sh
Test: ALLOW_MISSING_DEPENDENCIES=true m -j nothing
Change-Id: I0277a3a7225ebb87246c0117fdd51ebbf41adcc6
2020-11-13 15:04:26 -08:00
Fabien Sanglard
3d38ff9f38 Merge "Improve Zipalign test" 2020-11-13 20:43:11 +00:00
Fabien Sanglard
e5fd58a62d Merge "Fix zipalign alignment error" 2020-11-13 20:42:50 +00:00
Kelvin Zhang
cd4e7c0234 Merge "Filter out ab_partitions in source_info as well" 2020-11-13 16:42:49 +00:00
Bowgo Tsai
8218225794 Support PRODUCT_BUILD_VBMETA_IMAGE for target files
Currently we support skip building vbmeta.img when
PRODUCT_BUILD_VBMETA_IMAGE is set to false, which is used
when generating a system-only or vendor-only build artifacts.

However, when using `make dist` to build target files,
vbmeta.img is still generated. This change fixes this by
passing the related info to misc_info.txt for the release
tool to skip building vbmeta.img when necessary.

To make this happen, a device config should:
 1. Set PRODUCT_BUILD_VBMETA_IMAGE := false
 2. Remove 'vbmeta' from AB_OTA_PARTITIONS:
     AB_OTA_PARTITIONS += \
	 boot \
	 system \
    -    vbmeta \
	 dtbo \
	 product \
	 system_ext \
         vbmeta_system

Bug: 161659370
Test: `make dist` and checks the target file does not include vbmeta.img
Change-Id: Iddca9fe0b171a50a80e5a88aa462e118f18a7e6f
2020-11-13 11:28:17 +08: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
Sasha Smundak
0301d64545 Mark PRODUCT_xxx variables as single item instead of list
Evidenced by soong_config.mk settings and assignements across code base.

Test: treehugger
Bug: 116769560
Change-Id: I7dc27049a32df7b39680d93bddb23e6e6f1e84ca
2020-11-12 10:19:02 -08: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
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
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
Sasha Smundak
66589d1328 Use 'inherit-product/inherit-product-if-exists to include config files
Bug: 172923994
Test: treehugger
Change-Id: I762dfa8dc48c0b09597d2f7b6ef7f53062915a79
2020-11-10 09:59:28 -08: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
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
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
a6fe413946 Merge "Make dump-many-vars work for large variables" 2020-11-09 19:20:24 +00:00
Treehugger Robot
7bd7db619a Merge "Fix zipalign tests with GetExecutableDirectory" 2020-11-07 23:08:55 +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
7cd99eb450 Merge "Add snapuserd to VABC product and base_system.mk." 2020-11-06 23:26:18 +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
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
a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +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
d41b82563f Merge "Switch ramdisk.img to the LZ4 format" 2020-11-05 21:30:28 +00:00
Treehugger Robot
6be3371c23 Merge "Refactor zipalign to allow unit tests" 2020-11-05 19:10:22 +00:00
Roman Kiryanov
49803e35b9 Switch ramdisk.img to the LZ4 format
Bug: 169336853
Test: file out/target/product/emulator_x86_64/ramdisk.img
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I085d230a49cd92cc7fe3a620eec411d0e8b90667
2020-11-05 10:47:55 -08:00
Nikita Ioffe
bcfaaf9eb2 Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" 2020-11-05 14:02:33 +00:00
Bill Yi
f785ca2d76 Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" 2020-11-05 01:06:54 +00:00
Bill Yi
02ffec116f Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE
Merged-In: I2ac90f493820187f3b694a4113faeb5dbcaa9299
Change-Id: Ie492eadd3091d1ed077eb86d6ebfc318b5db2284
2020-11-04 14:04:04 -08:00