Commit graph

6794 commits

Author SHA1 Message Date
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
Justin Yun
54146eeed8 Update VNDK list for product modules
Add the list for product_available VNDK list.
This will be frozen by the release process.

Bug: 174323911
Test: build
Change-Id: Ic5f045d9210b09eef6d6c15230e8177d8c98bd22
2021-01-05 13:14:11 +09:00
Treehugger Robot
4a632325a4 Merge "Include snapuserd in recovery for VABC builds." 2020-12-30 08:27:43 +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
Kalesh Singh
7af0218468 Merge "Reply: Add stable aidl memtrack hal to vndk list" 2020-12-23 01:20:51 +00:00
Kalesh Singh
0386daa353 Reply: Add stable aidl memtrack hal to vndk list
Bug: 175021432
Test: m; boot;
Change-Id: I68906dde64d70c5be63ddea050b20f320a3e78aa
2020-12-22 20:50:06 +00:00
Isaac Chen
3aa08cfa94 Merge "Increase the size of super.img for Goldfish" 2020-12-22 16:56:49 +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
David Anderson
da770507ab Include snapuserd in recovery for VABC builds.
Bug: N/A
Test: snapuserd available in recovery
Change-Id: Ide10a1da72becffad53f1daf2594d57813fc6636
2020-12-21 23:35:45 +00:00
Andy Hung
d51e4c473f Merge "Remove libwebrtc_audio_processing" 2020-12-17 16:14:59 +00:00
Treehugger Robot
0de3a8b99f Merge "Move ro.zygote to vendor" 2020-12-17 07:02:25 +00:00
Treehugger Robot
98b7ac4602 Merge "Move jacocoagent installation to base_system" 2020-12-17 00:25:50 +00:00
Yifan Hong
42cae00cb0 Move jacocoagent installation to base_system
jacocoagent and its dependencies emits artifacts to system/,
hence it belongs to base_system.mk. It was rather incorrect
to add jacocoagent to EVERY product makefile because those
product makefiles may be enforcing artifact path requirements
(e.g. generic_ramdisk.mk).

Test: EMMA_INSTRUMENT=true m nothing
Bug: 175605139
Bug: 173742069
Change-Id: If9cb93ab8fd69d11e764ab830dc791bbe6106cf5
2020-12-16 09:50:42 -08:00
Treehugger Robot
fb991de5fe Merge "generic_ramdisk.mk add missing slash." 2020-12-16 13:53:29 +00:00
Anton Hansson
df38c92dd1 Merge "Add devices suitable for single-arch module builds" 2020-12-16 10:23:30 +00:00
Harish Mahendrakar
044ef90bf9 Remove libwebrtc_audio_processing
libwebrtc_audio_processing is no longer used by audio
preprocessing effects

Bug: 175749641
Test: Builds
Change-Id: Id60fe90d481ae74ea617260fb3cf88c0cc7da79b
2020-12-15 21:22:27 -08:00
Kalesh Singh
37638180d6 Merge "Revert "Add stable aidl memtrack hal to vndk list"" 2020-12-16 00:48:05 +00:00
Kalesh Singh
009936a198 Revert "Add stable aidl memtrack hal to vndk list"
Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I922441bf3629a5d50672f1466a1f52fb9e2c3cb0
2020-12-16 00:19:38 +00:00
Yifan Hong
e3a09008fb generic_ramdisk.mk add missing slash.
Test: pass
Bug: 173742069
Change-Id: Ie489858ff57cfc24b3cb28c61f85fffed1bbd4db
2020-12-15 13:53:19 -08: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
Treehugger Robot
78ee012509 Merge "Move goldfish RRO to vendor partition" 2020-12-15 01:53:03 +00:00
Treehugger Robot
886049dc15 Merge "Add stable aidl memtrack hal to vndk list" 2020-12-14 18:36:10 +00:00
Yo Chiang
9cf722cf2c Move goldfish RRO to vendor partition
Change PRODUCT_PACKAGE_OVERLAYS to DEVICE_PACKAGE_OVERLAYS so that
goldfish RROs are not pulled into GSI.
This moves the goldfish configs to vendor partition, and since GSI
doesn't include a vendor, this means GSI won't include the goldfish
configs.

Bug: 174816040
Test: Presubmit
Change-Id: Ia3b4ca5fbf23278e55f1f200c9b96568d8d03606
2020-12-14 14:52:56 +08:00
Treehugger Robot
2a9b7d7f9e Merge "Revert^2 "Move keymint to android.hardware.security."" 2020-12-12 00:14:21 +00:00
Tianjie Xu
7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Shawn Willden
49e1a2bb72 Revert^2 "Move keymint to android.hardware.security."
ea21979e96

Bug: 175345910
Bug: 171429297
Exempt-From-Owner-Approval: re-landing topic with no changes in this CL.
Change-Id: I1e49cee30493e4dd116bfbf0b2b78ec93191a7e5
2020-12-11 20:36:05 +00:00
Yifan Hong
999779bdce Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." 2020-12-11 20:24:19 +00:00
Orion Hodson
88256fd724 Merge "Revert "Move keymint to android.hardware.security."" 2020-12-11 12:29:46 +00:00
Orion Hodson
ea21979e96 Revert "Move keymint to android.hardware.security."
Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I1d1b8e1131328dd27b3a1818298b1c019dac59aa
2020-12-11 10:45:43 +00:00
Will McVicker
c0d7c7204f Merge "Update aosp_arm64 kernel 4.19 prebuilt name" 2020-12-11 07:52:19 +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
Shawn Willden
43943c65e2 Merge "Move keymint to android.hardware.security." 2020-12-10 22:49:14 +00:00
Yifan Hong
e086ae045e require-artifacts-in-path does not require PRODUCT_NAME/BRAND.
Also make generic_ramdisk.mk not to define them.

Test: m nothing
Change-Id: I5eff49abebe4194e3eba78557e5765e6ef2231e6
2020-12-10 13:18:29 -08: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
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
Shawn Willden
85573ddd41 Move keymint to android.hardware.security.
Test: VtsAidlKeyMintTargetTest
Change-Id: I86bccf40e0f5351b573248b59846cea017204c4a
2020-12-09 20:55:53 -07:00
Lingfeng Yang
e44fd5916c Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad467e4dd38e55d978142fa8582194278d371e3
2020-12-09 18:34:38 +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
Christian Wailes
4af080d7d7 Merge "Added new compiler filter properties for dexopt." am: e42b9ceb81
Original change: https://android-review.googlesource.com/c/platform/build/+/1479801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4adf3e98b8ee18683339247537433239e33e2046
2020-12-09 01:22:52 +00:00
Christian Wailes
e42b9ceb81 Merge "Added new compiler filter properties for dexopt." 2020-12-09 00:00:26 +00:00
Yifan Hong
6dbe939e08 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb169faa932d05c4ad79ed9e2304b5bb8157375
2020-12-08 19:18:27 +00:00
Yifan Hong
748d568b29 Merge "Remove e2fsck from generic ramdisk." 2020-12-08 18:43:28 +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
Chris Wailes
edbbf82586 Added new compiler filter properties for dexopt.
Bug: 173137187
Test: build
Merged-In: Ie413f5f0bcf5f691135530caee9111a496788ef8
Change-Id: Ie413f5f0bcf5f691135530caee9111a496788ef8
2020-12-07 16:15:55 -08:00
Kalesh Singh
343a6e9cf5 Add stable aidl memtrack hal to vndk list
Bug: 175021432
Test: m; boot;
Change-Id: Iac54ae2ba8aacee7fa9c5b1c8b49ff1cfd7c8785
2020-12-07 13:00:02 -05:00
SzuWei Lin
1b0f9bff9c Move ro.zygote to vendor
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.

Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
Merged-In: I86919f993ae44f3502eb63e728d33acaa14f7088
2020-12-07 08:05:27 +00:00