Commit graph

1204 commits

Author SHA1 Message Date
Ulya Trafimovich
347be4037e resolve merge conflicts of 56bf7ca8c9 to master
Test: DIST_DIR=$PWD/dist \
    TARGET_BUILD_VARIANT=userdebug \
    vendor/google/build/build_mainline_modules.sh
Bug: None
Change-Id: I66049dfb90c2583ea6687ac3353e3ce3eb973bd4
2021-01-20 12:44:40 +00:00
Nicolas Geoffray
897fe0e8df Split out minimal ART dexpreopt config and use it in mainline builds.
The config sets a few system properties that end up in command-line
arguments passed to dex2oat. Without these properties dex2oat invocation
fails, because options -Xms and -Xmx are do not have an argument.

Test: buid_mainline_modules.sh
Bug: 176171716
Change-Id: I4fd1f059aad5d48495948bfd668307de8b3d9ee1
2021-01-19 17:03:30 +00:00
Anton Hansson
0bafe32068 Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Merged-In: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
(cherry picked from commit c0423c8dae)
2021-01-13 11:05:20 +00:00
Presubmit Automerger Backend
a43fb599c0 [automerge] Use 64 bit binder in module builds 2p: c0423c8dae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13327146

Change-Id: Id34b5541f7b362d1418fe42697677cd7036ecd31
2021-01-13 11:05:13 +00:00
Anton Hansson
c0423c8dae Use 64 bit binder in module builds
Add a new BoardConfigModuleCommon for settings of this sort.

Bug: 176840868
Test: forrest module coverage build
Change-Id: Ie62261ecc0f0967f677a890a382fa1da060f7ff2
2021-01-13 11:04:02 +00:00
Yifan Hong
552f36c2f2 Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2c3 am: 42de1ac4c0 am: da6e54d6cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ceb59b8093d4bb2879b0d0a45792dca1cc2e6e4
2021-01-07 22:34:55 +00:00
Yifan Hong
1ed887f2c3 Merge "Add 5.10-android12-0 KMI for generic_arm64" 2021-01-07 21:23:10 +00:00
Yifan Hong
f57771a299 Add 5.10-android12-0 KMI for generic_arm64
... to build 5.10 GKI APEXes.

Test: TH
Bug: 160995535
Change-Id: I822ac73e8fc23cb957f748d4e6becdc3f7ac9567
2021-01-05 11:51:32 -08:00
Isaac Chen
b835f3aee3 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5 am: d180c32852
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac31ecb625100b6c2240d0fbc5b15befe8e6d8f6
2020-12-30 03:32:57 +00:00
Isaac Chen
c311ff6b68 Update GF board variable for dynamic partition
Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d
2020-12-25 06:14:43 +00:00
Isaac Chen
da255b5cdc Merge "Increase the size of super.img for Goldfish" am: 3aa08cfa94 am: a675bc6d18 am: d1306c0df2
Original change: https://android-review.googlesource.com/c/platform/build/+/1534301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38006ba30aaf803b05105a3ccef7b91e32faa70c
2020-12-22 18:16:14 +00:00
Isaac Chen
3aa08cfa94 Merge "Increase the size of super.img for Goldfish" 2020-12-22 16:56:49 +00:00
Anton Hansson
3ce9d68bd3 Merge "Add mainline_sdk device and product" am: 6d10bf974a am: 87e92d6e57 am: 96fb33a5d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1512778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d11513357f5ea21e84668529f1d9534e83f78f8
2020-12-22 13:07:48 +00:00
Anton Hansson
6d10bf974a Merge "Add mainline_sdk device and product" 2020-12-22 11:40:32 +00:00
Isaac Chen
91a641324c Increase the size of super.img for Goldfish
Current super image for GF is almost full in sdk_gphone_x86_arm
product, and not big enough to include CSI for mixed configuration,
which is a bit bigger than the system image of sdk_gphone_x86_arm.

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
Change-Id: Ia2473231c8490995a10700cbd6e0f82598a5e078
2020-12-22 03:43:26 +00:00
Anton Hansson
dc9a98bfd7 Merge "Add devices suitable for single-arch module builds" am: df38c92dd1 am: 1997f2c6d8 am: 8719b81073
Original change: https://android-review.googlesource.com/c/platform/build/+/1511789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b90df6605fc70c2e5b97a8a23ed5cbb8786d9f
2020-12-16 12:02:23 +00:00
Anton Hansson
82996e4bbc Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 18:59:40 +00:00
Anton Hansson
f68f92d3d5 Add mainline_sdk device and product
This device/product is suitable for a soong-only build that builds for
all the architectures needed for mainline modules sdk prebuilts.

Bug: 174315599
Test: TARGET_PRODUCT=mainline_sdk soong_ui --make-mode --skip-kati;
      (inspect soong.variables)
Change-Id: I3ab5d3611e25a666de39752dedaddbf32ddf6df7
2020-12-15 12:48:37 +00:00
Anton Hansson
bbd95df172 Add devices suitable for single-arch module builds
Prior to this the generic_* devices were typically used for this
purpose. There are a few reasons to create new specific ones:
- the generic_arm64 device has a hack specifically for building
  multi-arch packages that we want to avoid
- the generic_* devices include a bunch of emulator config that does not
  make sense for unbundled builds

Bug: 172256440
Test: verify unbundled builds migrated from generic_* don't change
Merged-In: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
Change-Id: Ia937461aa24a5d5b542f8688a1b71ac3fdeb596b
2020-12-15 11:42:39 +00:00
Tianjie Xu
f6b0177efc Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0 am: 5e1d91756b am: f6dcbbe401
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38e818e1fc340943ce675bb4247691b121f11cc1
2020-12-11 21:47:09 +00:00
Tianjie Xu
7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Tianjie
055128bf10 Use sha256 to build the hashtree in avb image
The hashtree is used in verified boot, and sha256 is more robust against
malicious attacks. Also, sha256 uses the same space as sha1 in the
hashtree. And there isn't much performance regression per
https://b.corp.google.com/issues/156162446#comment18

By putting the config in BoardConfigMainlineCommon.mk, we enable sha256
on all Pixels. And devices who want to use a different hash algorithm
can override it in it's own board configs.

Bug: 156162446
Test: boot the device and check performance
Change-Id: I9f1d3bcf241bc65adf10376cc5ae7ab1986216fa
2020-12-11 01:26:12 +00:00
Will McVicker
55cd0ee523 Update aosp_arm64 kernel 4.19 prebuilt name
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
Merged-In: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
2020-12-10 18:47:03 +00:00
Will McVicker
86f6344fbb Update aosp_arm64 kernel 4.19 prebuilt name
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
2020-12-10 10:45:26 -08:00
Anton Hansson
bb7111322c Merge changes Ib2a4a208,Ic8235912 am: 63d3835f4a am: 5f71a978d0 am: c6bd47a429
Original change: https://android-review.googlesource.com/c/platform/build/+/1520781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76f7065fa5c49c4ab33c024edeac9d5b11b92eab
2020-12-10 13:22:01 +00:00
Anton Hansson
63d3835f4a Merge changes Ib2a4a208,Ic8235912
* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
2020-12-10 12:20:26 +00:00
Lingfeng Yang
93f74429fa Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6 am: e44fd5916c am: 12492e2810
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9cd59f6ed5c7051b85ea670f35a3f15eed78f92
2020-12-09 20:19:45 +00:00
Lingfeng Yang
d5f89b11e6 Merge "emulator_arm64: Don't support AArch32" 2020-12-09 17:47:33 +00:00
Yifan Hong
e51c7e8aef Set allow list for generic ramdisk
Devices that uses generic ramdisk must inherit from generic_ramdisk.mk.
This makefile ensures that only a set of files can be installed to the
ramdisk. Other files must be installed to the vendor-ramdisk.

Let aosp_arm64 use this makefile.

Fixes: 173742069
Test: manual
Change-Id: Ib2a4a208deaf2f4d707bec256207b4b8479a601a
(cherry picked from commit bc9608c4c3f3cd0ac3f29863209c80fcfe4e2f7f)
2020-12-09 16:31:25 +00:00
Yifan Hong
2b7b66d475 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29 am: 6dbe939e08 am: d7fe9121b0
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a728504e674d02d66c7240ddd9f41abbd1c905c
2020-12-08 20:34:39 +00:00
Lingfeng Yang
9b6de576dc emulator_arm64: Don't support AArch32
This is needed for the emulator to run on Apple Silicon.

In addition, we're going to move to 64-bit only soon across the platform
so it makes more sense to go with 64-bit-only going forward here.

Change-Id: I0d9d189cd0b7a07d6c315e8c0f99c7b4766b4bde
2020-12-08 00:26:06 +00:00
Yifan Hong
1482fba34f Remove e2fsck from generic ramdisk.
On devices using the generic ramdisk / GKI,
e2fsck is moved to vendor ramdisk now.

Fixes: 173425293
Test: build and manual inspect.
Change-Id: I27562a875ca33a1b6dd3dcf862232fd4dfef6564
2020-12-04 15:28:57 -08:00
Treehugger Robot
b10f45078a Merge "aosp_arm64: clarify GKI in readme." am: 68f59362f4 am: 3cb8c98c30 am: 56ba49aae8 am: ca7201d88c
Original change: https://android-review.googlesource.com/c/platform/build/+/1500890

Change-Id: I590d6e48a273566ad4a203ee6f7d451f7c1e2dbf
2020-11-17 02:25:23 +00:00
Treehugger Robot
68f59362f4 Merge "aosp_arm64: clarify GKI in readme." 2020-11-17 00:46:41 +00:00
Yifan Hong
d440184471 aosp_arm64: clarify GKI in readme.
Test: none
Change-Id: Id24912a67c8700f3c68dfa924ab7b85246c7fcb0
2020-11-16 11:40:58 -08:00
Treehugger Robot
5a31062e55 Merge "OWNERS: include core sepolicy OWNERS" am: 696b0a2667 am: a9ca48d96a am: 045334a644 am: b1cb21701a
Original change: https://android-review.googlesource.com/c/platform/build/+/1499364

Change-Id: I5da0cf33e19d410544c1653c0ca78b052b4e97bf
2020-11-16 17:28:16 +00:00
Jeff Vander Stoep
f5dd057095 OWNERS: include core sepolicy OWNERS
Simplify OWNERS by referencing a centralized list.

Test: n/a
Change-Id: Ibbdb8b217e387bdc66069e91d034a933ca9fa2b0
2020-11-16 13:26:38 +01:00
Yifan Hong
24aca416d3 Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2 am: 1564782378 am: 254a91de7e am: aea8fc2c84
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256

Change-Id: I2366770390aea0f86e7e0baf8d55979fc2c940f8
2020-11-13 01:39:22 +00: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
3917b2019b Merge "Install e2fsck_ramdisk to GKI ramdisk." am: 97c8455634 am: 38d4d432b7 am: d0e4a325d5 am: c4803f8900
Original change: https://android-review.googlesource.com/c/platform/build/+/1489086

Change-Id: Ie1b1c7848ba3eae13b045c3cd06e70dd531f2a71
2020-11-07 04:14:55 +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
e7d780307e Merge "Phase out Legacy GSI" am: a0aebc1081 am: e2aef95b2d am: 2c1648bbc8 am: cbc7970d10
Original change: https://android-review.googlesource.com/c/platform/build/+/1485796

Change-Id: Idbf640ec5b38877b5486901582ef1f8a189410ed
2020-11-06 05:46:55 +00:00
Treehugger Robot
a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +00:00
Treehugger Robot
296df581df Merge "Switch ramdisk.img to the LZ4 format" am: d41b82563f am: af00a45d17 am: 5c7500deb9 am: c3d4dfa4f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1489080

Change-Id: Ie4ff0b08b40d536fc53ee9bceb674fddee156303
2020-11-05 22:40:10 +00:00
Treehugger Robot
d41b82563f Merge "Switch ramdisk.img to the LZ4 format" 2020-11-05 21:30:28 +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
Yifan Hong
7e9c7bfcf1 Merge "Enable BOARD_USES_GKI on aosp_arm64" am: 4503e6e383 am: edd0abfbc0 am: 254552fdb2 am: f53b60d8dd
Original change: https://android-review.googlesource.com/c/platform/build/+/1455954

Change-Id: I9932ab67652dfccb5ad85442812a10e56f4875ed
2020-11-03 20:37:08 +00:00
SzuWei Lin
d418471390 Phase out Legacy GSI
Legacy GSI is the GSI for the O/O-MR1 launching devices. VINTF and
VNDK do not support O/O-MR1 now. It is the time to phase out Legacy
GSI.

Bug: 162277261
Test: none
Change-Id: I55901604da21daa58b51ee6676cd61bb9e4ff5e6
2020-11-03 18:23:57 +08:00
Yifan Hong
c10e367912 Enable BOARD_USES_GKI on aosp_arm64
Enable BOARD_USES_GENERIC_KERNEL_IMAGE := true. In addition:
- Disable recovery_as_boot
- Disable recovery (PRODUCT_BUILD_RECOVERY_IMAGE=false)

Test: builds, and mmma packages/modules/Gki
Bug: 156098440
Change-Id: If6988f6b44f098ed8f1dc214eee1f2223fd03ae8
2020-11-02 11:28:20 -08:00