Commit Graph

28743 Commits

Author SHA1 Message Date
Pierre-Clément Tosi
b3be181687 Merge changes from topic "default-pvmfw-image"
* changes:
  Add generic board-agnostic pre-built pvmfw.img
  Add framework for building the pvmfw.img partition
  Stop assuming that pvmfw.img can only be pre-built
2021-10-06 07:25:01 +00:00
Treehugger Robot
950fef5e34 Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" am: 9885f2f744 am: 72c7768320
Original change: https://android-review.googlesource.com/c/platform/build/+/1843156

Change-Id: I53eaeb87edae934938381b884e2cac4b9c8dcd84
2021-10-05 02:15:02 +00:00
Treehugger Robot
72c7768320 Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" am: 9885f2f744
Original change: https://android-review.googlesource.com/c/platform/build/+/1843156

Change-Id: Ib1b20e7c1da4427c30a98d11a2729724ad176be8
2021-10-05 02:02:22 +00:00
Treehugger Robot
9885f2f744 Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" 2021-10-05 01:47:30 +00:00
Cole Faust
f2485e3f36 Merge "Add RBC board configuration" am: 4de9bc79fb am: 64fc316e47
Original change: https://android-review.googlesource.com/c/platform/build/+/1842084

Change-Id: Ibb0cf70393a5dc83685e0e4bfd01533a59c50778
2021-10-05 01:18:57 +00:00
Cole Faust
64fc316e47 Merge "Add RBC board configuration" am: 4de9bc79fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1842084

Change-Id: Ibd9b3fc8f4fe4007747c61aa98c9f737b0964ece
2021-10-05 01:01:45 +00:00
Cole Faust
4de9bc79fb Merge "Add RBC board configuration" 2021-10-05 00:49:48 +00:00
Treehugger Robot
4d15c8b486 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2 am: 30e367dbb4
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Change-Id: I1ccd60fedef28857ccb4aee70b828942c18d17cf
2021-10-04 21:13:54 +00:00
Treehugger Robot
30e367dbb4 Merge "Allow compatibility suite also build a test list" am: 7fe5450be2
Original change: https://android-review.googlesource.com/c/platform/build/+/1844555

Change-Id: Ib15076b49fd207382fb18dfe554203ec13b2f126
2021-10-04 20:57:28 +00:00
Treehugger Robot
7fe5450be2 Merge "Allow compatibility suite also build a test list" 2021-10-04 20:43:52 +00:00
Dan Shi
fd4802435c Allow compatibility suite also build a test list
The list of tests will be used to filter tests during test mapping run.

Bug: 201591516
Test: m dist cts vts
Change-Id: I2fd63b93c78af4fa88672aa903c87a4777691806
2021-10-04 11:41:06 -07:00
TreeHugger Robot
6a98b6b571 Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71"" into sc-dev-plus-aosp 2021-10-04 14:13:41 +00:00
Pierre-Clément Tosi
592a3ca91b Introduce BOARD_PVMFWIMAGE_PARTITION_SIZE
Rename the BOARD_PVMFWIMG_PARTITION_SIZE variable to follow the format
used by all other partitions: BOARD_$(name)IMAGE_PARTITION_SIZE. Note
that all boards using that variable should have been updated to also
define the new version, by now.

Define the new variable as board read-only, as done for other
partitions.

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: I5664c903db6388458e906e996115b695220932ca
2021-10-04 14:20:49 +02:00
Yi-Yo Chiang
597fb757cb Merge changes If929bcf9,I9fb5c7fc am: 747a0c12eb am: f93950ae53
Original change: https://android-review.googlesource.com/c/platform/build/+/1842716

Change-Id: I9ba0dd105c54dc5ec3e3ea449fb8e591a559e5f2
2021-10-04 10:14:12 +00:00
Yi-Yo Chiang
f93950ae53 Merge changes If929bcf9,I9fb5c7fc am: 747a0c12eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1842716

Change-Id: I0f9bc530c3e2e83b14efcad778870bc0d7795888
2021-10-04 10:00:49 +00:00
Pierre-Clément Tosi
3bda0d6992 Add generic board-agnostic pre-built pvmfw.img
Make use of the pvmfw.img-building AOSP framework to provide a common
default image instead of requiring boards to necessarily provide their
own but allow over-writing it through BOARD_PREBUILT_PVMFWIMAGE, if
desired.

Note: The Android Virtualization Framework requires the pvmfw partition.

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: I5e06f08d6e22178e45254b7ab63acd3855d99a38
2021-10-04 11:56:56 +02:00
Yi-Yo Chiang
747a0c12eb Merge changes If929bcf9,I9fb5c7fc
* changes:
  Dedup build rules of ramdisk-(debug|test-harness).img
  Build vendor_ramdisk[-debug].img if building vendor_boot.img
2021-10-04 09:50:36 +00:00
Pierre-Clément Tosi
fa8193c0e9 Add framework for building the pvmfw.img partition
Adapt the variables necessary for building pvmfw.img by following what
was done for other Android partitions and introducing:

 - PRODUCT_BUILD_PVMFW_IMAGE
 - BUILDING_PVMFW_IMAGE
 - BUILT_PVMFWIMAGE_TARGET

Replace the manual 'cp' by the more common 'copy-one-file'.

Bug: 199831815
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img # with TARGET_PKVM_ENABLED=true
Change-Id: I5e4bbcbdbf4b96281ee54631938f097e9744883c
2021-10-04 11:41:34 +02:00
Pierre-Clément Tosi
88648d33c9 Stop assuming that pvmfw.img can only be pre-built
Introduce the BOARD_USES_PVMFWIMAGE variable, similarly to all other
partitions, and use it where appropriate (in particular, where the
soon-to-be incorrect assumption that pvmfw.img could only be a pre-built
board image was made).

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img # with TARGET_PKVM_ENABLED=true
Change-Id: I8f4faa78c741d29b473303b521834387dbd48cd1
2021-10-04 11:37:19 +02:00
Howard Chen
758fa5d831 Merge "Make GSI target to export bootimage to DIST" am: c1b9c1d801 am: 8a59680b4f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839815

Change-Id: Idbfddae657da2479f8a5ff4dad5e07ce2b4189f2
2021-10-04 07:13:20 +00:00
Howard Chen
8a59680b4f Merge "Make GSI target to export bootimage to DIST" am: c1b9c1d801
Original change: https://android-review.googlesource.com/c/platform/build/+/1839815

Change-Id: Ibac747f40c9a961fbe692f511b2edfef11f07247
2021-10-04 06:59:55 +00:00
Howard Chen
c1b9c1d801 Merge "Make GSI target to export bootimage to DIST" 2021-10-04 06:36:32 +00:00
Cole Faust
e5e7a2d531 Add RBC board configuration
This does largely the same thing as in product configuration,
it converts the board makefiles and evaluates them in place
of an $(include).

Bug: 201700692
Test: Temporarily replace the ifndef RBC_BOARD_CONFIG with RBC_PRODUCT_CONFIG,
      then ./build/bazel/ci/rbc_product_config.sh aosp_arm64-userdebug
Change-Id: I91c3dd6b91cf6bfeb18a5fff95d53b7a2c113c57
2021-10-01 17:56:54 -07:00
Martin Stjernholm
42904d1346 Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2). am: f68bd2db71"
This reverts commit 29502219df.

Reason for revert: Follow AOSP for prebuilts in the -plus-aosp branch, i.e. disable them.

Change-Id: I615c644229fbb55a60633c3cc1aba2497674c0b0
2021-10-01 18:40:25 +00:00
Colin Cross
41171358e9 Merge "Support per-testcase directories in all test suites" am: 894e9be3f7 am: 651b8b7eb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1838354

Change-Id: Ic356a788a99ea3dc59c460c9f82986f940c6301b
2021-10-01 17:03:23 +00:00
Colin Cross
651b8b7eb0 Merge "Support per-testcase directories in all test suites" am: 894e9be3f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1838354

Change-Id: I27999b873212cb1ab52cb75a7dd9a6992d595145
2021-10-01 16:46:26 +00:00
Colin Cross
894e9be3f7 Merge "Support per-testcase directories in all test suites" 2021-10-01 16:27:55 +00:00
Jeongik Cha
fe6ef7c08a BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists
BOARD_SYSTEMSDK_VERSIONS should be checked by BOARD_API_LEVEL,
BOARD_SHIPPING_API_LEVEL, or PRODUCT_SHIPPING_API_LEVEL in a forward
order.

Bug: 201489975
Test: BOARD_SYSTEMSDK_VERSIONS := 30, PRODUCT_SHIPPING_API_LEVEL := 31,
BOARD_API_LEVEL := 30, and then check if there isn't an error

Change-Id: I00e3bf8dda6e6e87a2daf42c74d703503cbeed1f
2021-10-01 23:30:13 +09:00
Yi-Yo Chiang
6c51a43bcc Dedup build rules of ramdisk-(debug|test-harness).img
Adjust code location, factor out common code, eliminate dead code.

Bug: 201753847
Test: Presubmit; change is noop
Change-Id: If929bcf92bc03305058d2d8179c8dba351961c8e
2021-10-01 21:45:44 +08:00
Yi-Yo Chiang
870ea163c2 Build vendor_ramdisk[-debug].img if building vendor_boot.img
Make vendor_boot.img / vendor_ramdisk.img symmetrical to boot.img /
ramdisk.img.

Bug: 201753847
Test: Build and check vendor_ramdisk[-debug].img
Change-Id: I9fb5c7fca09a77446bd140ca549c2091fc9c6a40
2021-10-01 21:45:34 +08:00
Ulyana Trafimovich
166f4ff2ec Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 85ed8ef84f am: e6a4320cb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1841575

Change-Id: I85a852a875351bc9f18f1f3cd09d13e4d485e749
2021-10-01 07:48:41 +00:00
Ulyana Trafimovich
e6a4320cb0 Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 85ed8ef84f
Original change: https://android-review.googlesource.com/c/platform/build/+/1841575

Change-Id: Id9dfc110111e09a3d82d0ae6f76ce943431b8bb6
2021-10-01 07:34:20 +00:00
Ulyana Trafimovich
85ed8ef84f Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." 2021-10-01 07:21:39 +00:00
Yi-Yo Chiang
3e37268a58 Merge "Refactor build logic of boot-debug & vendor_boot-debug" am: 710e74588b am: dd2fe1f51d
Original change: https://android-review.googlesource.com/c/platform/build/+/1839816

Change-Id: I120da50545d7014f074aac68fd0a220bf50bfdf3
2021-10-01 02:03:21 +00:00
Yi-Yo Chiang
dd2fe1f51d Merge "Refactor build logic of boot-debug & vendor_boot-debug" am: 710e74588b
Original change: https://android-review.googlesource.com/c/platform/build/+/1839816

Change-Id: If62de0660fb5f5e5f39ec5ce89384c97e635c9fe
2021-10-01 01:53:00 +00:00
Yi-Yo Chiang
710e74588b Merge "Refactor build logic of boot-debug & vendor_boot-debug" 2021-10-01 01:35:23 +00:00
Anton Hansson
311dfa0ef3 Merge "Update base sdk extension version to 1" into stage-aosp-master am: 200bada63c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15934175

Change-Id: Id1ccf89e6cd9e924f9d5c7ca53cdbcd9cd34018b
2021-09-30 13:10:37 +00:00
Ulya Trafimovich
ddec79ce54 Remove unused variable SKIP_BOOT_JARS_CHECK.
The variable is no longer used after https://r.android.com/1737753.

Bug: 189298093
Test: m
Change-Id: I6bcb6735189429551ebca697441f2a1edb5c4dfa
2021-09-30 14:00:34 +01:00
Anton Hansson
200bada63c Merge "Update base sdk extension version to 1" into stage-aosp-master 2021-09-30 12:49:03 +00:00
Yi-Yo Chiang
4d7c613c58 Refactor build logic of boot-debug & vendor_boot-debug
Add PRODUCT variables
  PRODUCT_BUILD_DEBUG_BOOT_IMAGE
  PRODUCT_BUILD_DEBUG_VENDOR_BOOT_IMAGE
as toggles to enable/disable building boot-debug & vendor_boot-debug.

Bug: 200945738
Test: m bootimage_debug
Change-Id: Ic032b8594f776f911d7b6345a97d64fed930d890
2021-09-30 18:32:55 +08:00
Howard Chen
95339b0d91 Make GSI target to export bootimage to DIST
This is to support a bootimage only target in AB.

Bug: 198363484
Test: lunch aosp_arm64-userdebug; make bootimage dist

Change-Id: I9a32c365f635ec4693675a1969d7a1e684c8f55a
2021-09-30 07:10:05 +00:00
Treehugger Robot
63aa5e048e Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c am: b4dcb50d1f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I10c23cfe47d1d4e1a2340c9bf4767b34109e4881
2021-09-30 00:58:16 +00:00
Treehugger Robot
b4dcb50d1f Merge "Show mk2rbc warnings when they occur" am: 64bc620d8c
Original change: https://android-review.googlesource.com/c/platform/build/+/1839198

Change-Id: I42248bdf71f73686412cb2eb7dcf659ceb61c074
2021-09-30 00:45:11 +00:00
Treehugger Robot
64bc620d8c Merge "Show mk2rbc warnings when they occur" 2021-09-30 00:32:45 +00:00
Colin Cross
2b595c26d1 Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev 2021-09-29 16:59:52 +00:00
Anton Hansson
c9b330cacc Update base sdk extension version to 1
S ships with extension version 1, so the correct base extension version
is 1 at the moment.

Bug: 199852423
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      verify IsBaseSdk=true
Change-Id: I465d896fdeacfe34bdbfa0da1871d74a3bf3ee11
2021-09-29 17:15:58 +01:00
Treehugger Robot
898e531d0a Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a am: c4b0e4f1cd
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I47aef52ece71bfe96a7a31fba1f76b060f966094
2021-09-29 16:13:21 +00:00
Treehugger Robot
c4b0e4f1cd Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I732f4aeea701961784ab3897fd1a2eda1440f049
2021-09-29 15:57:03 +00:00
Cole Faust
e96edc34ce Fix parsing issues in board_config.mk
Soong's "androidmk" makefile parser couldn't parse
board_config.mk due to these issues.

Fixes: 201440410
Test: Manually
Change-Id: I2dc298fb969a140e14f704a8c9f9f2ec98be7bc0
2021-09-28 12:43:04 -07:00
Xin Li
68b4fefd60 Merge SP1A.210812.016
Merged-In: I6bbbf0d627c2e978beb28c2fc4ebac142ca63c1e
Change-Id: I4777de3e09216497b88f6916f8a5997e4cd10743
2021-09-28 19:25:30 +00:00