Commit Graph

27372 Commits

Author SHA1 Message Date
Petri Gynther
689e11a7ce Fix typo: DLKIMMAGE
Fix two typos in Makefile.

It turns out that BOARD_ODM_VENDOR_DLKMIMAGE is not correct.
Need to replace it with BOARD_PREBUILT_ODM_DLKMIMAGE.

Test: use grep to check usage
Change-Id: If73b15d7abb7504aa313d616f6cef2d80d76705d
2021-03-10 21:07:41 -08:00
Treehugger Robot
58a209973a Merge "VINTF logs ends in .log suffix." am: 3eca99ee7a am: d43fc78000 am: f7517cd260
Original change: https://android-review.googlesource.com/c/platform/build/+/1624980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f223dc68667cb0c31366c24cd33d66b952a91aa
2021-03-11 03:22:26 +00:00
Devin Moore
5a635f9e34 Merge "Throw an error if androidboot.hardware is used for bootconfig" am: b6840067c4 am: e53227a119 am: 1de28aae3d
Original change: https://android-review.googlesource.com/c/platform/build/+/1624569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97d02e9426b9e547029c265caad8bc7e2ef09b57
2021-03-11 03:21:52 +00:00
Treehugger Robot
f7517cd260 Merge "VINTF logs ends in .log suffix." am: 3eca99ee7a am: d43fc78000
Original change: https://android-review.googlesource.com/c/platform/build/+/1624980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib89c253a4991af1a87bb38355f8c98aff5b0cd8f
2021-03-11 03:17:33 +00:00
Devin Moore
1de28aae3d Merge "Throw an error if androidboot.hardware is used for bootconfig" am: b6840067c4 am: e53227a119
Original change: https://android-review.googlesource.com/c/platform/build/+/1624569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8711f8a35ae14e59d471b11732b080a11b542202
2021-03-11 02:40:42 +00:00
Yifan Hong
80ab21490b Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS to check_vintf_compatible_log
If kernel checks are missing, this can tell
us explicitly that the flag was disabled.

Test: pass
Change-Id: If5de88edbf352c163bc725c3e02a8cd29312e7f5
2021-03-10 18:10:13 -08:00
Treehugger Robot
3eca99ee7a Merge "VINTF logs ends in .log suffix." 2021-03-11 02:07:23 +00:00
Cindy Zhou
5d793fb740 Enable cfi for 32bit arch
Enabling cfi for 32-bit arch; b/35157333 seems to have been resolved in b/67507331.

Bug: 158010610

Test: manual interaction with Wimbley device: youtube video, chrome
navigations, gmail
MPTS testing on Sargo

Change-Id: I79eeb7e880ea09d857f8339901b67f77243a575c
2021-03-10 17:10:21 -08:00
Devin Moore
d6eab6f827 Add bootconfig to kernel cmdline when BOARD_BOOTCONFIG not empty
The 'bootconfig' kernel cmdline parameter needs to exist for the kernel
to search for bootconfig.
If BOARD_BOOTCONFIG contains anything, then add the parameter to the
kernel cmdline.

Test: Boot cuttlefish and verify /proc/cmdline has 'bootconfig' after
removing it from cuttlefish BoardConfig.mk
Bug: 173815685

Change-Id: I112a2a8e02ba7265c5547d9244298e07f26985ba
2021-03-10 16:28:49 -08:00
Devin Moore
b6840067c4 Merge "Throw an error if androidboot.hardware is used for bootconfig" 2021-03-10 22:42:12 +00:00
Treehugger Robot
20ddb0d89a Merge "Workaround for existing packages check failure when the generic product is used with ART prebuilts." am: 40ea7379a8 am: 1837e64d2d am: 15d6b176ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1622507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cc28d5315947f744f8a23b0e5619ba77838d4ea
2021-03-10 21:59:07 +00:00
Petri Gynther
1426cab468 Copy vendor_ramdisk[-debug].img to out/dist
Test: make
Change-Id: Ibac6424f600b77d222585c17a91d59fb6985df26
2021-03-10 13:22:29 -08:00
Petri Gynther
d7946d13f0 Add support for building vendor_ramdisk-debug.img
Existing BoardConfig.mk variable:
BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true

generates:
out/target/product/<name>/vendor_ramdisk.img

Extend the above to additionally generate:
out/target/product/<name>/vendor_ramdisk-debug.img

as the two ramdisks should be built together.

Test: make
Change-Id: Ief572e30c9225d0f5569e9ff89096c69accafc7f
2021-03-10 13:22:29 -08:00
Treehugger Robot
15d6b176ad Merge "Workaround for existing packages check failure when the generic product is used with ART prebuilts." am: 40ea7379a8 am: 1837e64d2d
Original change: https://android-review.googlesource.com/c/platform/build/+/1622507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie27e95bebd9dcd888ae1fd915bece387b29cb194
2021-03-10 21:14:12 +00:00
Treehugger Robot
40ea7379a8 Merge "Workaround for existing packages check failure when the generic product is used with ART prebuilts." 2021-03-10 19:13:43 +00:00
Colin Cross
dfa1752be7 Merge "Fix kati regen due to build_number.txt" am: 6023b1944d am: 1b74125136 am: e7db5a634b
Original change: https://android-review.googlesource.com/c/platform/build/+/1623659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07b6a43a8c62b1978c4441ae87e016f47d2d849d
2021-03-10 02:55:09 +00:00
Colin Cross
e7db5a634b Merge "Fix kati regen due to build_number.txt" am: 6023b1944d am: 1b74125136
Original change: https://android-review.googlesource.com/c/platform/build/+/1623659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaba24909230aa4d423e08bb9710034de5d3eaceb
2021-03-10 02:12:04 +00:00
Devin Moore
2e43e34d53 Throw an error if androidboot.hardware is used for bootconfig
Bootconfig does not allow the keys to have values and subkeys at the
same time.
"androidboot.hardware" and "androidboot.hardware.*" subkeys have existed as
kernel cmdline parameters. We want to throw an error at build time when
"androidboot.hardware" is use in bootconfig because it may be a common
occurence while migrating to bootconfig.
"hardware" should be used instead, without the "androidboot" prefix.

Test: build with and without "androidboot.hardware=test" in
BOARD_BOOTCONFIG
Bug: 173815685

Change-Id: Ic62a86cb23c9d79dbdbacd18eed3449210566ce7
2021-03-09 16:59:33 -08:00
Colin Cross
6023b1944d Merge "Fix kati regen due to build_number.txt" 2021-03-10 00:50:47 +00:00
Yifan Hong
fd150d3dcc VINTF logs ends in .log suffix.
This is so that it can be viewed in the web
browser directly.

Test: pass
Change-Id: Ib35a93ab6beac550a593ec46814100ff851f32a5
2021-03-09 12:19:33 -08:00
Martin Stjernholm
e564ec3502 Workaround for existing packages check failure when the generic
product is used with ART prebuilts.

The prebuilt packages in packages/modules/ArtPrebuilt don't get
Android.mk entries in the `generic` product (as opposed to e.g.
`aosp_arm`), so the enforce-product-packages-exist check fails there.

Exclude the ART APEX modules from the check as a workaround. It's also
necessary to remove the check for superfluous allow list entries, since
which modules are actually missing depends on many other variables (see
runtime_libart.mk).

Test: m nothing TARGET_PRODUCT=generic \
      SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Bug: 182105280
Change-Id: Id67278615f3e7c64c7658bbf1b2aa71ed6b381da
2021-03-09 12:49:06 +00:00
Ulyana Trafimovich
3fb41ab4b7 Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: d534e22d10 am: e6a4da4796 am: 8896b81e4d
Original change: https://android-review.googlesource.com/c/platform/build/+/1615201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a52ace844ede85ab62770ba3d8d3815c9e1cceb
2021-03-09 10:50:12 +00:00
Ulyana Trafimovich
8896b81e4d Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: d534e22d10 am: e6a4da4796
Original change: https://android-review.googlesource.com/c/platform/build/+/1615201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd8bb59e9b5adb43564e2caf0accb6e892199915
2021-03-09 10:06:19 +00:00
Ulyana Trafimovich
d534e22d10 Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." 2021-03-09 08:40:23 +00:00
Po Hu
6e64c14ce9 Fix kati regen due to build_number.txt
Do NOT touch build_number.txt if BUILD_NUMBER is explicitly set
but not changed from last build.

Bug: 182221512
Test: BUILD_NUMBER=123 m nothing
Change-Id: Ic88f6e0d2b9767d84e1ec5c826018d1ea08c0fc0
2021-03-09 14:11:05 +08:00
Petri Gynther
bcace74d16 Merge changes I65c0c3c9,I61740a30 am: 2ebf9b6798 am: 6a07708991 am: 045e256f9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1621806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0934fa2226ef658e30f058b8da96e57fe01b425
2021-03-09 03:28:28 +00:00
Petri Gynther
045e256f9f Merge changes I65c0c3c9,I61740a30 am: 2ebf9b6798 am: 6a07708991
Original change: https://android-review.googlesource.com/c/platform/build/+/1621806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b548df5137c96d60a5a42c1fb82e4dd8be819bc
2021-03-09 02:37:41 +00:00
Treehugger Robot
bc226b1b81 Merge "Cleanup: internal vendor ramdisk targets" am: 896fee8a63 am: 88cc8ab48b am: bb6fada802
Original change: https://android-review.googlesource.com/c/platform/build/+/1622224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1a54b261bb7eb2ad688716667f616e119d944a2
2021-03-09 01:42:20 +00:00
Treehugger Robot
bb6fada802 Merge "Cleanup: internal vendor ramdisk targets" am: 896fee8a63 am: 88cc8ab48b
Original change: https://android-review.googlesource.com/c/platform/build/+/1622224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib703f49dd3fc9fc747ad4e083f3f88e6bca4b56c
2021-03-09 00:57:01 +00:00
Petri Gynther
728e0bd468 Cleanup: fileslist target commands
Remove unnecessary @ and $(hide) from fileslist target commands.
Keep @echo to print that line with a progress bar [ x% x/y ].

Test: make
Change-Id: I65c0c3c9c045cc7ca2c2801ee6b3b0c996be59a9
2021-03-08 14:12:35 -08:00
Petri Gynther
4c063e33c8 Cleanup: ram disk -> ramdisk
Test: make
Change-Id: I61740a309c6637c10b935806f7b379cfaf3ae855
2021-03-07 00:52:46 -08:00
Petri Gynther
6a6d6217d7 Cleanup: internal vendor ramdisk targets
Test: make
Change-Id: I356e82ab9b32164ff734567f489faf31021dfc4b
2021-03-07 00:51:40 -08:00
Petri Gynther
7f25d1e721 Merge "Add support for building vendor_ramdisk.img" am: 0ceba881c5 am: 28c619a577 am: e96cd1d3e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1619809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30bfd5153b0cd1c92cfa7122224fb0069610aeac
2021-03-06 08:30:39 +00:00
Petri Gynther
e96cd1d3e1 Merge "Add support for building vendor_ramdisk.img" am: 0ceba881c5 am: 28c619a577
Original change: https://android-review.googlesource.com/c/platform/build/+/1619809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6d08c5d5337b74b8ab9c58bcec4fe9fbf2d7827
2021-03-06 08:05:39 +00:00
Petri Gynther
828828ba07 Add support for building vendor_ramdisk.img
Allow BoardConfig.mk to set:
BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true

to build:
out/target/product/<name>/vendor_ramdisk.img

This is done to support GKI device kernel development.

Kernel developers build vmlinux + DTB + GKI kernel modules locally
and then use kernel build tools to output:

* vmlinux + ramdisk.img => boot.img
* GKI kernel modules + DTB + vendor_ramdisk.img => vendor_boot.img

In other words, kernel developers use ramdisk.img and vendor_ramdisk.img
as prebuilts for building flashable boot.img and vendor_boot.img
directly from the kernel development environment.

Test: make vendorramdisk with BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true
Test: make vendorramdisk with BOARD_BUILD_VENDOR_RAMDISK_IMAGE omitted
Change-Id: Id67839887b6bf608f4a5f13384c551c12ee9fdbd
2021-03-05 17:45:03 -08:00
Martin Stjernholm
7de94747df Merge "Always use ART sources for Fuchsia." am: b579ef2cf9 am: 46fd61b091 am: cdbb2504db
Original change: https://android-review.googlesource.com/c/platform/build/+/1620973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia95a1ec77854cf1c6a944a532f91a98ed0121f8b
2021-03-06 01:03:32 +00:00
Martin Stjernholm
cdbb2504db Merge "Always use ART sources for Fuchsia." am: b579ef2cf9 am: 46fd61b091
Original change: https://android-review.googlesource.com/c/platform/build/+/1620973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09f2f5993a30956a318ca9b6723a1daefa1f88c2
2021-03-06 00:09:28 +00:00
Martin Stjernholm
b579ef2cf9 Merge "Always use ART sources for Fuchsia." 2021-03-05 22:46:22 +00:00
Treehugger Robot
761a4c90f1 Merge "Fix m bootimage_test_harness failure" am: 5d8217afb7 am: 871b1aa2ba am: 3a8c5a58f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1618683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35e3a01601470eaea63a64d4e706bad679e2b53d
2021-03-05 17:02:45 +00:00
Treehugger Robot
3a8c5a58f5 Merge "Fix m bootimage_test_harness failure" am: 5d8217afb7 am: 871b1aa2ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1618683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1f95dea8a8469999cd3ea2edb59d2e7a15b26fb
2021-03-05 16:24:35 +00:00
Martin Stjernholm
399fc37446 Always use ART sources for Fuchsia.
Fuchsia currently adds a number of ART internal packages in
device/google/fuchsia/fuchsia.mk, so it cannot use prebuilts.

Test: m TARGET_PRODUCT=fuchsia_arm64 \
        TARGET_BUILD_VARIANT={user,eng} nothing
  with SOONG_CONFIG_art_module_source_build set to false by default.
Bug: 172480615
Change-Id: I6af54accd8cc724b92072ae112960ace8faa70d5
2021-03-05 15:59:20 +00:00
Treehugger Robot
5d8217afb7 Merge "Fix m bootimage_test_harness failure" 2021-03-05 15:03:39 +00:00
Ulya Trafimovich
6f06f9ea7a Disable verify_uses_libraries check if dexpreopt is globally disabled.
Without dexpreopt the check is not necessary, and although it is good to
have, it is difficult to maintain on non-linux build platforms where
dexpreopt is generally disabled (the check may fail due to various
unrelated reasons, such as a failure to get manifest from an APK).

Bug: 181570790
Bug: 132357300

Test: Emulate the failed no-dexpreopt build in b/181570790:
  - modify verify_uses_libraries to make a subcommand fail
  - check that the build with dexpreopt fails:
    $ lunch cf_x86_64_phone-userdebug && m
  - set `WITH_DEXPREOPT := false` in make/core/board_config.mk
  - check that the build without dexpreopt succeeds (allow boot image
    and system servert dexproept to avoid unrelated build failures, this
    does not affect verify_uses_libraries):
    $ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true \
      lunch cf_x86_64_phone-userdebug && m

Change-Id: Ic456be4e3047a60415a21fae658077165fb03165
2021-03-04 12:35:02 +00:00
Petri Gynther
423c46da1a Merge "Rename vendor-ramdisk to vendor_ramdisk" am: b10f7d2a9c am: 2c789cf026 am: be8682a693
Original change: https://android-review.googlesource.com/c/platform/build/+/1613866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53d8f3c749de28770dc49c1391fc2af2663a9092
2021-03-04 06:53:52 +00:00
Bowgo Tsai
f85e68f554 Fix m bootimage_test_harness failure
Commit I66b57de91042bfd56ba54a3659843d8cf7873955 added the support
for different boot partition sizes but didn't consider the case of
building boot-test-harness.img. This CL fixes this by allowing
'boot-test-harness.img' as a boot image variant.

Bug: 181618515
Test: `m bootimage_test_harness` pass
Change-Id: I190d3bf26725ac54999758efbca66a94c5cd5c86
2021-03-04 14:41:16 +08:00
Petri Gynther
be8682a693 Merge "Rename vendor-ramdisk to vendor_ramdisk" am: b10f7d2a9c am: 2c789cf026
Original change: https://android-review.googlesource.com/c/platform/build/+/1613866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81ee4480d458b80218e0dcc8fa6afcad72365db2
2021-03-04 06:11:13 +00:00
Petri Gynther
b10f7d2a9c Merge "Rename vendor-ramdisk to vendor_ramdisk" 2021-03-04 04:40:04 +00:00
Petri Gynther
dc24d88aa9 Rename vendor-ramdisk to vendor_ramdisk
Rename to get consistent ramdisk directory naming in
out/target/product/<name>:
  debug_ramdisk
  ramdisk
  vendor_debug_ramdisk
  vendor_ramdisk

Test: build and inspect out/target/product/<name>
Change-Id: I81d8f2cafe5e1b9024196cd74772b78d4a4aec58
2021-03-03 13:56:48 -08:00
Xin Li
2b1c89090f Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:41 +00:00
Martin Stjernholm
2629c11f49 Merge "Add a product variable to override APEX modules in boot jar lists." am: 2344aacd02 am: a4ecf9761a am: b3c450c22f
Original change: https://android-review.googlesource.com/c/platform/build/+/1610907

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb6b98158492a116da18c2acafa31d43f09a6ae5
2021-03-03 14:33:14 +00:00