Commit Graph

67344 Commits

Author SHA1 Message Date
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 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 6023b1944d Merge "Fix kati regen due to build_number.txt" 2021-03-10 00:50:47 +00: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 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 2ebf9b6798 Merge changes I65c0c3c9,I61740a30
* changes:
  Cleanup: fileslist target commands
  Cleanup: ram disk -> ramdisk
2021-03-09 01:22:22 +00:00
Treehugger Robot 896fee8a63 Merge "Cleanup: internal vendor ramdisk targets" 2021-03-08 23:37:42 +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 0ceba881c5 Merge "Add support for building vendor_ramdisk.img" 2021-03-06 06:55:05 +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 b579ef2cf9 Merge "Always use ART sources for Fuchsia." 2021-03-05 22:46:22 +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
Tianjie Xu 56cc49eab9 Merge changes I6ccf5fb9,I39a308fb
* changes:
  Add a check for missing entries in AVB_FOOTER_ARGS_BY_PARTITION
  Add missing R partitions in AVB_FOOTER_ARGS
2021-03-04 19:19:40 +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
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 b10f7d2a9c Merge "Rename vendor-ramdisk to vendor_ramdisk" 2021-03-04 04:40:04 +00:00
Tianjie bf0b8a8610 Add a check for missing entries in AVB_FOOTER_ARGS_BY_PARTITION
Fail the signing if the AVB_FOOTER_ARGS_BY_PARTITION isn't in sync
with common.AVB_PARTITIONS.

Bug: 181787095
Test: run sign_target_files_apks on a S image

Change-Id: I6ccf5fb9f39b92c1da2554f5b3826d2cd87d84d7
2021-03-03 17:31:48 -08:00
Tianjie 697c6eecf6 Add missing R partitions in AVB_FOOTER_ARGS
If we miss these entries, the signing script won't correctly update
the avb prop to build the vbmeta. This cl adds the missing partitions
for R build.

In the followup, we need to make the map in sync with AVB_PARTITIONS in
common.py

Bug: 181787095
Test: run sign_target_files_apks
Change-Id: I39a308fb7028b45ce08f0ca3c6ad61a6c13e8082
2021-03-03 15:28:58 -08:00
Brad Ebinger 35d002f9f5 Merge "Remove deprecated RcsService/PresencePolling apps" 2021-03-03 23:24:13 +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
Xin Li b2ec711a7f Merge RQ2A.210305.007
Bug: 180401296
Merged-In: Ifc7f272e273f54df843650e7e74fcad40a76994a
Change-Id: I7a08adbca4a7f82be6e56c9ccb88b0ea7d5fc139
2021-03-03 09:12:01 -08:00
Martin Stjernholm 2344aacd02 Merge "Add a product variable to override APEX modules in boot jar lists." 2021-03-03 11:04:54 +00:00
Brad Ebinger 21bf64a70a Remove deprecated RcsService/PresencePolling apps
There is now an AOSP API for RCS UCE, removed the
deprecated RcsService/PresencePolling app targets.

Bug: 178489990
Test: make + inspect build
Merged-In: I0eaa321dfd75de8217c465a523d439ea702deea4
Change-Id: I0eaa321dfd75de8217c465a523d439ea702deea4
2021-03-03 00:47:38 +00:00
Martin Stjernholm efe6a4d748 Add a product variable to override APEX modules in boot jar lists.
Test: m droid SOONG_CONFIG_art_module_source_build=false
      on internal branch
Bug: 180325915
Change-Id: I3ab64860fe4a60468ec8dad6517d1d67f72f13c7
2021-03-02 20:53:59 +00:00
Treehugger Robot 7e3f5430a8 Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4
Original change: https://android-review.googlesource.com/c/platform/build/+/1595337

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f272e273f54df843650e7e74fcad40a76994a
2021-03-02 19:58:45 +00:00
Treehugger Robot f2507339e5 Merge "Fix typo in sysprop.mk and Changes.md" am: 1996d581d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1612294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaac0c7796e5ed0c91df42f14d1d23bf861e74ac0
2021-03-02 19:58:12 +00:00
Treehugger Robot 36c1435ec4 Merge "Include android_soong_config_vars.mk in the make (kati) step." 2021-03-02 09:20:37 +00:00
Treehugger Robot 1996d581d8 Merge "Fix typo in sysprop.mk and Changes.md" 2021-03-02 08:10:08 +00:00
Treehugger Robot 0fa0300013 Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1469d7db94532250ccded11a58f2fee99dea2c96
2021-03-02 02:05:12 +00:00
Treehugger Robot afeb2bc404 Merge "Update m help text with guidance on parallelism" am: f3b8056189
Original change: https://android-review.googlesource.com/c/platform/build/+/1612064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9de7523364d907232b038447e4aa07be3aa812
2021-03-02 02:04:36 +00:00
Treehugger Robot 0181c7d33c Merge "Allow BOARD_VNDK_VERSION to be changed" 2021-03-02 01:22:45 +00:00
Treehugger Robot f3b8056189 Merge "Update m help text with guidance on parallelism" 2021-03-02 01:11:33 +00:00
TreeHugger Robot 0547bfd774 Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master 2021-03-02 01:09:06 +00:00
Donghyun Jo 8c65ef6574 Fix typo in sysprop.mk and Changes.md
android_info_pro -> android_info_prop
partititon -> partition
PRODUCT_SYSTEM_PROPERITES -> PRODUCT_SYSTEM_PROPERTIES

Test: build and manual test

Signed-off-by: Donghyun Jo <donghyun.jo@samsung.com>
Change-Id: I0b7f0566aaa5ce8844003bb4f373389c20ddeb88
2021-03-02 08:51:03 +09:00
Martin Stjernholm 786bbea407 Include android_soong_config_vars.mk in the make (kati) step.
Test: `m nothing` with https://r.android.com/1592872
Bug: 172480615
Change-Id: I960cd234a5dd607f4f5af6bb68ae15b9bd104e7a
2021-03-01 23:14:10 +00:00
Andrew Scull 2f8015f71a Merge "Add pvmfw partition to target files" am: 5553b5704c
Original change: https://android-review.googlesource.com/c/platform/build/+/1595341

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83e3ecd8d6cf9847c38508ab088ccb66d193c7a7
2021-03-01 21:48:32 +00:00
Colin Cross 3fb7ddf3bc Update m help text with guidance on parallelism
Remove "-j" from the default recommended arguments and add a paragraph
describing the -j behavior.

Test: m help
Change-Id: Id5a5f4719f18ea2a9d09df43f5fb38592a59f5c9
2021-03-01 13:32:13 -08:00
Andrew Scull 5553b5704c Merge "Add pvmfw partition to target files" 2021-03-01 21:05:56 +00:00
Xin Li 3f904dd415 Merge RQ2A.210305.007 into stage.
Bug: 180401296
Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
Change-Id: I1c3a82d5c420fbb97e81379034947d35024b0925
2021-03-01 00:54:23 -08:00
Xin Li 457b809bcc DO NOT MERGE - Mark RQ2A.210105.001 as merged.
Bug: 180401296
Merged-In: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
Change-Id: I4a86e7513cb1aac30c431674427a658fe24ae374
2021-03-01 00:43:12 -08:00
Treehugger Robot 011aee1bc9 Merge "support pre-defined timestamp and uuid when bulid EROFS images" am: 0a4788c3fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1595714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
2021-03-01 07:25:30 +00:00
Treehugger Robot 0a4788c3fb Merge "support pre-defined timestamp and uuid when bulid EROFS images" 2021-03-01 06:29:49 +00:00
Joe Onorato fe65f90925 Merge "Add dirmods command to envsetup.sh" am: 2599d32a40
Original change: https://android-review.googlesource.com/c/platform/build/+/1607836

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8e1b50cabe45a9643ca22ac31a39f8905825ab0
2021-02-26 23:14:17 +00:00
Joe Onorato 2599d32a40 Merge "Add dirmods command to envsetup.sh" 2021-02-26 22:13:30 +00:00
Joe Onorato 2c1aa47057 Add dirmods command to envsetup.sh
It will query module-info.json for modules inside a given directory.

Test: . build/envsetup.sh ; dirmods frameworks/base
Change-Id: Iad3dcb038315f49c156764e34fb5f52ec3ad29be
2021-02-26 08:57:23 -08:00