Commit Graph

6892 Commits

Author SHA1 Message Date
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
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
Yifan Hong a3237f249c Merge "Add linker to VAB with vendor_ramdisk" am: 69ba9af617
Original change: https://android-review.googlesource.com/c/platform/build/+/1515823

Change-Id: I080a319718999524d1d6420570c0408b4613c785
2020-12-03 20:14:59 +00:00
Yifan Hong 914ef21c28 Add linker to VAB with vendor_ramdisk
Add linker.vendor_ramdisk for Virtual A/B devices with
a vendor_ramdisk because e2fsck is dynamic.

Test: pass
Bug: 173425293
Change-Id: I0a6f5bf15362e28eaa07a4d639ea23749b94b0f5
2020-12-02 19:51:16 -08:00
Yifan Hong 90dd8696d4 Merge "Add Virtual A/B with vendor ramdisk product." am: 08d1865332
Original change: https://android-review.googlesource.com/c/platform/build/+/1506505

Change-Id: If927d3717936c4eaa382ceb691f780a9f7e3f2c1
2020-12-03 03:46:54 +00:00
Yifan Hong 08d1865332 Merge "Add Virtual A/B with vendor ramdisk product." 2020-12-03 03:02:35 +00:00
Xin Li 4bc4ff3c11 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I880b5dfb7bfea4b6abef9fcb603abcb383d84f42
Change-Id: I3c3385a1c58004f1ee6124de0c86dfff614a3bf6
2020-12-02 00:03:31 -08:00
Martijn Coenen 05d7fefb7d Add on-device signing binary to base.
Bug: 165630556
Test: inspect image
Change-Id: Ia428165be4a9800df23918330ab027458c84836d
2020-11-27 12:22:46 +01:00
Anton Hansson 8c73673e73 Add bootclasspath config to its own makefile
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
2020-11-25 18:53:37 +00:00
Yifan Hong 6b7cc73ec5 Add Virtual A/B with vendor ramdisk product.
If vendor_ramdisk exists, it is preferred to use launch_with_vendor_ramdisk.mk
because it moves e2fsck to vendor_ramdisk, making ramdisk smaller.

Devices that uses VABC is assumed to have a vendor ramdisk, so inherit
from this new makefile.

Test: pass
Change-Id: If6adad9985ca4750225fd4263edb42de1ddaf486
2020-11-23 15:17:01 -08:00
Yifan Hong 942987d116 Add symlinks to legacy Virtual A/B makefiles.
For Virtual A/B makefiles that is created before S, add
symlinks so that existing devices don't break.

Test: pass
Change-Id: Ie04c4a8a2375edc673a8a7a2adcd162b21178f68
2020-11-23 15:17:01 -08:00
Yifan Hong 018c698280 Move virtual_ab makefiles to its own dir.
Also add a readme file.

Test: none

Change-Id: Ia1e02d8fb0c6df13271f208b3ca1dc1f250b085b
2020-11-23 15:17:01 -08:00
David Anderson 01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +00:00
Bo Hu 1816caecf1 Merge "emulator: enable cfi for emulator's wifi driver" 2020-11-20 02:17:44 +00:00
Treehugger Robot 3ccf730cdc Merge "Use 'inherit-product/inherit-product-if-exists to include config files" 2020-11-19 23:54:27 +00:00
bohu 79106cd3ab emulator: enable cfi for emulator's wifi driver
Since the wpa_supplicant_8 has enabled cfi, the
static lib that it uses should enable cfi, otherwise
there will be runtime crashes.

BUG: 169343095
Test:
lunch sdk_phone_arm64-userdebug
m -j
run the image on the aarch64-linux host
hostapd_nohidl and wpa_supplicant should
not crash with cfi failures.

Change-Id: I00e3840032530ee62aac69cab0b54755f83291f9
2020-11-19 12:50:47 -08:00
David Anderson 8820eaa5e5 Move snapuserd into the vendor ramdisk.
For devices that are GKI capable, including virtual_ab_ota_compression
will now include snapuserd in the vendor ramdisk.

For devices that are not GKI-capable (eg do not have vendor_boot),
virtual_ab_ota_compression_retrofit.mk must be included in addition to
virtual_ab_ota_compression.mk. This structure is to avoid needing a
large combination of different Makefiles.

Bug: 173463595
Test: manual test
Change-Id: Idc740d3523c2d166dd578cee41ea07d7eaf8edfa
2020-11-18 22:12:34 -08:00
Treehugger Robot fa91bf2fad Merge "Make related stuff for Keymint V1." 2020-11-17 16:13:50 +00:00
Palmer Dabbelt 750061ddf8 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" 2020-11-17 03:45:50 +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
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
Treehugger Robot 8e00778fb6 Merge "Add libdmabufheap to VNDK SP list" 2020-11-14 01:25:09 +00:00
Hridya Valsaraju cfd80b3a6e Add libdmabufheap to VNDK SP list
Test: make
Bug: 154310076
Change-Id: I0ec2bce1a6636ac332c7dee370173a727d9d013b
2020-11-11 16:31:31 -08:00
Palmer Dabbelt 2d691edf69 Add dmuserd to PRODUCT_PACKAGES_DEBUG
This is a simple dm-user daemon that will be used for the QA tests.

Test: manual, b/171749628
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: I37b78a1479f08f37fe7cff3f2e201dc6d8a6e584
2020-11-10 13:48:02 -08: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
Sasha Smundak 66589d1328 Use 'inherit-product/inherit-product-if-exists to include config files
Bug: 172923994
Test: treehugger
Change-Id: I762dfa8dc48c0b09597d2f7b6ef7f53062915a79
2020-11-10 09:59:28 -08:00
David Anderson 7cd99eb450 Merge "Add snapuserd to VABC product and base_system.mk." 2020-11-06 23:26:18 +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 a0aebc1081 Merge "Phase out Legacy GSI" 2020-11-06 04:00:40 +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
Yi Kong 25328f5cb9 Add profcollect to PLATFORM_PACKAGES_DEBUG
... but it does not get turned on automatically. This is controlled by
profcollect_native_boot.enabled device config.

Test: boot device and verify profcollectd is disabled by default
Bug: 79161490
Change-Id: Ia91b9759e108896f275633e3156355b65dc94299
2020-11-04 09:44:27 +08:00
Treehugger Robot c0f701287c Merge "Add keystore2 to PLATFORM_PACKAGES" 2020-11-03 20:37:23 +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
Janis Danisevskis 95799b056e Add keystore2 to PLATFORM_PACKAGES
Add keystore 2 to the PLATFORM_PACKAGES in anticipation for the Keystore
2.0 migration. This builds and installs keystore2 on the device, but it
does not get started yet. Staring keystore2 is currently controlled with
the platform property ro.android.security.keystore2.enable=true.

Bug: 171305684
Test: keystore2 builds and is present on the device but does not start
      unconditionally.
Change-Id: Id92cb2aa38022516067853d89d6c3210db1100a8
2020-10-28 19:40:51 -07:00
Justin Yun 75f7cf9a2d Add fs_config_(dirs|files) for product and system_ext
These files were added to devices with the fs_config_files_nonsystem
module in base_vendor.mk. As they are partition-specific, move them
to each base_<partition>.mk file.

To add the fs_config_* files to the base_<partition>.mk files, it is
required to define the fs_config_* regardless of the existance of
partitions.

Bug: 170282998
Test: build and check if they are installed.
Change-Id: Ib8a2c75e2e0e93bb7030da981494e880f8465e5a
2020-10-21 03:39:22 +00:00
Treehugger Robot 611f7f5ca0 Merge "Update VNDK version for common graphics HALs." 2020-10-20 23:56:51 +00:00
Daniel Norman 6a93af91dc Merge "Removes usage of TARGET_NO_VENDOR_BOOT." 2020-10-20 17:18:01 +00:00
Steven Moreland 40a9f49ced Update VNDK version for common graphics HALs.
We are adding things to them, and in order for core libraries like libui
to use them, the newer versions need to be in the VNDK.

Bug: 170435409
Test: build
Change-Id: I18495d303ae8bd68f35631b2be2dc9dcf915e991
Merged-In: I18495d303ae8bd68f35631b2be2dc9dcf915e991
2020-10-19 21:04:21 +00:00
Daniel Norman ad6293c098 Removes usage of TARGET_NO_VENDOR_BOOT.
- true -> PRODUCT_BUILD_VENDOR_BOOT_IMAGE=false
- false -> (removed, uses default option which builds vendor-boot.img
            if BOARD_BOOT_HEADER_VERSION>=3)

Bug: 170423509
Test: Inspect build artifacts from treehugger.
Change-Id: Id16fbda7fdfc70d62db389d6efb5201cb0d6d4e3
2020-10-16 15:10:21 -07:00
David Anderson 607800d615 Add snapuserd to VABC product and base_system.mk.
Bug: 168259959
Test: builds
Change-Id: I289f84e293c84b12f5f33f8940643bac43ff5d35
2020-10-16 15:07:52 -07:00
Makoto Onuki e1faea86f9 Merge "Remove unneed jar files from the system partition" 2020-10-16 15:41:16 +00:00
Makoto Onuki 90ac5ae188 Remove unneed jar files from the system partition
Fix: 170967644
Test: boot
Test: Make sure the following jar files are removed
$OUT/system/framework/service-blobstore.jar
$OUT/system/framework/service-jobscheduler.jar

Change-Id: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
Merged-in: Ia5351d9d3b1dda7bf96e95bbaad171cd8c3b49fc
2020-10-15 13:06:58 -07:00
Martin Stjernholm a530fa9825 Merge "Rename com.android.art module." 2020-10-14 17:56:42 +00:00
Devin Moore 761f5fe164 Merge "Update vndk list for android.hardware.common.fmq" 2020-10-13 14:58:08 +00:00
Martin Stjernholm 1cced44791 Rename com.android.art module.
Paving the way for renaming the ART release APEX to com.android.art.

Test: m
Bug: 169639321
Change-Id: I55af4b3dcba48757e7fb65d5d4bc7517c91ae80f
2020-10-13 14:37:19 +01:00
Devin Moore 68a3cef45e Update vndk list for android.hardware.common.fmq
Change created with update-vndk-list.sh for the new package.

Test: m
Bug: 142326204
Change-Id: Iecd2ad2fc2f00c0214dc3ad4bf60661b492c5e4f
2020-10-09 13:48:01 -07:00
Steve Muckle 0f0fa1a07d Revert^2 "use new GKI kernel location"
a0281768fe

This revert includes a fix to use the lz4 variant of the kernel,
as was the case before, rather than the uncompressed one.

Bug: 170451791
Change-Id: Iaab082d8bba04df82d742d682251447f3e21fe9b
2020-10-09 10:32:57 -07:00
Xiao Ma a0281768fe Revert "use new GKI kernel location"
Revert "Update kernel to builds 6888926"

Revert submission 1454075-2020-10-07-gki-update

Reason for revert: Looks like this topic changes caused daily build broken, the error log as:

error: +out/target/product/emulator_arm64/boot.img too large (34934784 > 33484800)

I tried to revert this topic first and then feel free to revert revert it.

Reverted Changes:
Ie74ca26e8:use new GKI kernel location
Ibff0d9638:Update kernel to builds 6889747
I693476e82:Update kernel to builds 6888926
I35d7f320c:Update kernel to builds 6888926
Id221a7a30:Update kernel to builds 6888926
I4421dbf67:remove kernel, kernel modules from cuttlefish_kern...
I991f9a6af:Allow downstream devices to customize vendor modul...
I598630e09:load kernel, kernel modules from updated locations...

Bug: 170451791
Change-Id: I4d8f18a7c80eb92cb475c48e1dcf04ceabd08984
2020-10-09 07:22:45 +00:00
Steve Muckle 4f10706721 use new GKI kernel location
The GKI kernel is now stored in kernel/prebuilts.

Bug: 161563956
Change-Id: Ie74ca26e8e9bf05c824eb87e03eeda865d861dde
2020-10-08 20:25:49 +00:00
Treehugger Robot 09da8b1ba1 Merge "Include selinux_policy_* for product and system_ext." 2020-10-08 00:49:44 +00:00
Treehugger Robot c50ba5554a Merge "Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt" 2020-10-07 20:45:52 +00:00
Justin Yun 599330f865 Include selinux_policy_* for product and system_ext.
After separating selinux_policy_system_ext and selinux_policy_product
from the selinux_policy_nonsystem module, add them to
base_system_ext.mk and base_product.mk, respectively.

Bug: 170282998
Test: build and check boot
Change-Id: I03a4ae435898dd773f418d37f321ad0a37f17c3e
2020-10-07 18:16:45 +09:00
Dan Shi 82c4cb74c6 Remove build tasks for vts10
Bug: 169581727
Test: build
Change-Id: I865553ae07bc6eac3b90f87a494537102c398280
2020-10-05 10:17:21 -07:00
Colin Cross 988ca5f04e Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5 am: 2afae90d46 am: 5ff38b8498
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I61af4fa7d12de65ad1f8fa056a297f40b61b63ff
2020-10-02 02:41:11 +00:00
Colin Cross 2afae90d46 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" am: 3ed9b8b7f9 am: 9d560baab5
Original change: https://android-review.googlesource.com/c/platform/build/+/1437493

Change-Id: I9d408d5e0b04788f05663d86aa11e1f8c5c844a4
2020-10-02 01:52:47 +00:00
Colin Cross 3ed9b8b7f9 Merge "Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds" 2020-10-02 01:06:10 +00:00
Mathieu Chartier 802767b583 Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe am: f96088c1da am: 49f48872ff am: b6d672978c
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: I6b7c729635db5be80a3651d0d82939d46b697b6c
2020-09-30 23:31:26 +00:00
Mathieu Chartier 49f48872ff Merge "Do not set ro.iorapd.enable=true" am: 62ae5b55fe am: f96088c1da
Original change: https://android-review.googlesource.com/c/platform/build/+/1440211

Change-Id: Ia800db8a9383727205e4f533911e7649fb158118
2020-09-30 22:32:15 +00:00
Janis Danisevskis 3cc7647af1 Add android.system.keystore2-V1-ndk_platform.so to gsi/current.txt
Change-Id: Icd9644e468a29d5ca47291faaaa9f5ca3fc4902c
2020-09-29 07:09:45 -07:00
Wang Han 4a4a4df0af Do not set ro.iorapd.enable=true
* This is true by default, this is redundant.

Change-Id: I936d701c8b644ea4667bf855a71448c8d7a1448a
2020-09-27 13:11:18 +00:00
Colin Cross eb013b236e Manually install hwasan runtime on SANITIZE_TARGET=hwaddress builds
Due to bugs in Soong around prebuilt libraries with stubs versions,
the hwasan runtime was installed into /system/lib64/bootstrap, but the
module was not given a ".bootstrap" suffix.  Once the bugs are fixed,
the hwasan runtime is no longer installed because the dependencies
on "libclang_rt.hwasan-aarch64-android" are now on an uninstallable
stubs library.  Add libclang_rt.hwasan-aarch64-android.bootstrap
to PRODUCT_PACKAGES when SANITIZE_TARGET=hwaddress is set.

Test: m checkbuild
Change-Id: I732d37505274c7bf804396921202f2bcca4484ec
2020-09-24 12:47:50 -07:00
David Anderson 4b51c8cb06 Merge "Add virtual A/B compression product." am: 1fdef5f75a am: e5d2e92c5b am: ab87f94acb am: ad4a29aff5
Original change: https://android-review.googlesource.com/c/platform/build/+/1426180

Change-Id: I05a3f290f6147a99b2bb4752066230290edc7a8f
2020-09-24 00:39:09 +00:00
David Anderson ab87f94acb Merge "Add virtual A/B compression product." am: 1fdef5f75a am: e5d2e92c5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1426180

Change-Id: I2d34d2c8c5ad9b61e0497de0e6c675f81ebfd307
2020-09-23 23:30:22 +00:00
David Anderson 1fdef5f75a Merge "Add virtual A/B compression product." 2020-09-23 22:19:15 +00:00
Anton Hansson 3fc285a21a Merge "Remove SafetyRegulatoryInfo from generic system" 2020-09-22 08:52:22 +00:00
Wilson Sung 45f7514a42 Cleanup legacy project code am: b251795103
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12524922

Change-Id: I7cc8cebfbe90b7cedc7b03d5127c2f20e07b0194
2020-09-22 08:25:06 +00:00
Anton Hansson 863a944b5f Merge "Remove SafetyRegulatoryInfo from generic system" into rvc-dev-plus-aosp am: 0721499720 am: 532f6e453e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12628152

Change-Id: I6fca40dc6e325cf8a756e277f0fea35b432c8288
2020-09-22 08:23:39 +00:00
Yanting Yang e109340cfa Remove SafetyRegulatoryInfo from generic system
SafetyRegulatoryInfo should not exist in AOSP.

Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
2020-09-22 08:34:52 +01:00
Anton Hansson 0721499720 Merge "Remove SafetyRegulatoryInfo from generic system" into rvc-dev-plus-aosp 2020-09-22 07:34:24 +00:00
Wilson Sung b251795103 Cleanup legacy project code
Bug: 155898698
Change-Id: Ie9c417893b988718019d7efa3461aeb431319443
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-09-22 07:30:45 +00:00
Treehugger Robot 48af4f6529 Merge "Add an aosp target that supports 64-bit app only" am: f5941dae52 am: 9ad9398223
Original change: https://android-review.googlesource.com/c/platform/build/+/1430099

Change-Id: I25160e7bb6fe65e2cd674bfe2304679abd3f39bc
2020-09-21 18:21:42 +00:00
Tim Van Patten 1c18908d4f Merge "Add ANGLE.apk to the base system" am: 54f87c12e9 am: 9c5f12cab9 am: ca3069049b am: 0f6c3bfdfd
Original change: https://android-review.googlesource.com/c/platform/build/+/1431045

Change-Id: I6e88d98dcad291f632b60d995aad96cd3de13c60
2020-09-21 18:20:16 +00:00
Treehugger Robot f5941dae52 Merge "Add an aosp target that supports 64-bit app only" 2020-09-21 17:48:36 +00:00
Sam Lin 7c9f562d00 Add an aosp target that supports 64-bit app only
Bug: 168796046
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
Merged-In: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-21 17:44:46 +00:00
Tim Van Patten ca3069049b Merge "Add ANGLE.apk to the base system" am: 54f87c12e9 am: 9c5f12cab9
Original change: https://android-review.googlesource.com/c/platform/build/+/1431045

Change-Id: I2a9030ee1014488f8dc6b3c8c52664118c3b7d0b
2020-09-21 17:21:13 +00:00
Tim Van Patten fad0ce8296 Add ANGLE.apk to the base system
This CL re-enables building ANGLE as parta of the base system. This was
done up until the recent merge of goog/master to aosp/master, and is
required as part of enabling ANGLE as the default OpenGL ES driver for
Cuttlefish.

Bug: b/168625635
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I12c8db290ed7dc6b213b6f1c22692666dcdf143f
Merged-In: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
2020-09-18 11:32:01 -06:00
Yanting Yang 88156d11d9 Remove SafetyRegulatoryInfo from generic system
SafetyRegulatoryInfo should not exist in AOSP.

Fixes: 166139891
Test: make && flash to verify regulatory option of Settings
Merged-In: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
Change-Id: I5fbef719ba30cdbf37e0d4c6daa06a50c06e9495
2020-09-18 06:57:15 +00:00
David Anderson e5c8867691 Add virtual A/B compression product.
Sets ro.virtual_ab.compression.enabled and includes snapuserd_ramdisk.

A device will do the following to enable virtual a/b compression:

$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota_compression.mk)

Bug: 168257347
Test: build with product included
Change-Id: Ide19576a69629389a7878d5dff3c5706c22527d9
2020-09-17 12:15:19 -07:00
Calvin Huang d05c58cf12 Merge "Add an aosp target that supports 64-bit app only" into rvc-qpr-dev am: 0605e11f99
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12503225

Change-Id: I8594b3044d28b6469172e1dd33852cf5add8f955
2020-09-17 19:08:42 +00:00
Sam Lin d001fb334d Add an aosp target that supports 64-bit app only
Bug: 164166032
Test: N/A
Change-Id: I57116fe67cbe1322f348c9d0506655f32a900dcc
2020-09-16 17:15:10 -07:00
Treehugger Robot 655bee3cd2 Merge "Disable sparse image for GSI products" am: 6651152c08 am: 3ef10eee71 am: 76efa7d199 am: 6304ce5a66
Original change: https://android-review.googlesource.com/c/platform/build/+/1421368

Change-Id: I90fc5924e34a1cdd40202d0c05349fa85c3afcef
2020-09-11 10:54:50 +00:00
Treehugger Robot 76efa7d199 Merge "Disable sparse image for GSI products" am: 6651152c08 am: 3ef10eee71
Original change: https://android-review.googlesource.com/c/platform/build/+/1421368

Change-Id: I91b91ce6a1d3924bf575ed8c0da8e51116462e00
2020-09-11 09:29:52 +00:00
Treehugger Robot 6651152c08 Merge "Disable sparse image for GSI products" 2020-09-11 08:17:49 +00:00
Treehugger Robot 3f2eab4fb2 Merge "llkd: moved from optional to required component" am: e1239cd1ad am: ab45f8b97c am: aa71197643 am: 07dc604680
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I1b18b3ccb35cf4e0fe0a633bd5272bac8b0e5efe
2020-09-08 19:56:23 +00:00
Treehugger Robot aa71197643 Merge "llkd: moved from optional to required component" am: e1239cd1ad am: ab45f8b97c
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I91ec0f43d6fc5345477ae37945c363d5659e46f1
2020-09-08 19:27:24 +00:00
Treehugger Robot ab45f8b97c Merge "llkd: moved from optional to required component" am: e1239cd1ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1421668

Change-Id: I9c651d8a902c5fe7fc77a7ae0d2ef73593eebc1a
2020-09-08 18:58:12 +00:00
Mark Salyzyn fbb45227c0 llkd: moved from optional to required component
The Live Lock Killer Daemon (llkd) has provided enough hero moments to
improve system stability, by providing actionable collection of data
to resolve kernel, and some user space, misbehaviors.  It is time to
move llkd to a required component.

NB: For llkd to be effective at finding real kernel live lock
conditions, system requirements are that there are no more un-waited
for Zombie processes, and that no kernel drivers use indeterminate
periods of uninterruptible sleep.  Any kernel and user space tasks
that are killed because of suspicious behavior, must themselves have
a benefactor to restart them if necessary.  If a true live lock is
discovered, data will be collected and the kernel will be panic'd to
recover from the situation.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 164946924
Test: llkd is ever present on a release build.
Change-Id: I986a8545252bc5b68d09a6a0f4f506a58998c8a0
2020-09-08 07:58:16 -07:00
Yo Chiang 90339f9563 Disable sparse image for GSI products
There are a couple of use cases where we don't want sparse image:
1. `DynamicSystemInstallationService` in Q framework doesn't support
   sparse images.
2. Super image manipulation tools (like `lpadd`) doesn't play nice with
   sparse images.

Force non-sparse GSI so we don't break backwards compatibility (1) and
we don't need to write `simg2img` everywhere (2).

Bug: 167695592
Test: Prepare a device flashed with Q framework
Test: Build system.img and create system.img.zip; the image is non-sparsed
Test: m tradefed-all && \
  tradefed.sh run commandAndExit template/atest_local_min \
  --template:map preparers=template/preparers/dsu-preparer \
  --extra-file system-img.zip=out/.../system.img.zip \
  --dynamic-system-update:disable-tear-down
Change-Id: Ib7667165ce53e87eb86bc7d3f56c80a418123a62
2020-09-08 16:55:43 +08:00
Tim Van Patten 7cd1fdbfbb Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7 am: 288133d95d am: 29a62efb80 am: 9a31e9eff9
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6840a88336ba4719dd9b5b62b51beb3514bac21d
2020-09-02 17:57:33 +00:00
Tim Van Patten 29a62efb80 Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7 am: 288133d95d
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I18496607c8a94b818cb83a63694fd384a18d48a3
2020-09-02 16:35:04 +00:00
Tim Van Patten 288133d95d Merge "Indicate ANGLE is present on devices" am: 27ca29a3c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1395711

Change-Id: I6f4e173192db664d5d1462179b5b44b821596674
2020-09-02 15:55:50 +00:00
Emilian Peev 208bbdd21b Cherry-pick spirit of 23abbfeb4b
(Revert "Add libdepthphoto to mainline_system")

Bug: 167450283
Fixed: 167450283
Merged-In: Id2013f80dbc962f70ccb1b687c0dc18fef372348
Change-Id: Id2013f80dbc962f70ccb1b687c0dc18fef372348
2020-09-01 23:25:07 +00:00
Tim Van Patten d38244210f Indicate ANGLE is present on devices
The system property ro.gfx.angle.supported needs to be enabled when
ANGLE is included in a build to indicate to the platform and CTS tests
that ANGLE is present on the device.

Test: atest CtsAngleIntegrationHostTestCases
Bug: 157670307
Merged-in: Ide4e3d8f78d3748d557a47ecd153d66694fd1e3a
Change-Id: I72ba8731fed36dbc594dae88aaa00a6299e8f4ae
2020-09-01 13:26:18 -06:00
Xin Li c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Treehugger Robot 67d2fe8058 Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac am: 59a4a06170 am: a05aba7c86 am: 88eb59d624
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I125719519b3388f7cd7e52330b33188104ac9d47
2020-08-25 01:57:59 +00:00
Treehugger Robot a05aba7c86 Merge "Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64" am: 5c9667d1ac am: 59a4a06170
Original change: https://android-review.googlesource.com/c/platform/build/+/1392541

Change-Id: I9b0c5e001fbbbf25b6fb86559e376fc8804a48ad
2020-08-25 00:25:57 +00:00
Yifan Hong e5ab7a241b Set BOARD_KERNEL_MODULE_INTERFACE_VERSIONS for aosp_arm64
Test: m com.android.gki.boot-5.4_5.4-android12-0
Bug: 162888350
Change-Id: I8ac387cc52e498c2790c0b84e866a307fdd1ae8b
2020-08-24 12:23:27 -07:00
Steve Muckle 2f17246fe7 enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-08-20 10:17:37 -07:00
Steven Moreland 3e27237e5e Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070 am: 9d0f80aa9f am: 6c8f9f6830 am: 0a6c654d9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: Iedb083c5df58dbf2279a4dcb6fba055918a24e17
2020-08-18 20:57:30 +00:00
Steven Moreland 6c8f9f6830 Merge "vndservice removed if w/o vndservicemanager" am: 0113aa2070 am: 9d0f80aa9f
Original change: https://android-review.googlesource.com/c/platform/build/+/1402963

Change-Id: I7835e20a072fa60b03fffe3f08097d81adaffd1b
2020-08-18 20:28:45 +00:00
Steven Moreland 0113aa2070 Merge "vndservice removed if w/o vndservicemanager" 2020-08-18 20:06:46 +00:00