Commit Graph

6404 Commits

Author SHA1 Message Date
Jing Ji 5f97d6d24f Remove a couple of LMK properties from GSI image
These two properties shouldn't be set in GSI image from R on,
otherwise they'll force lmkd to use the legacy strategy.

Bug: 136212765
Test: run cts-on-gsi -m CtsFileSystemTestCases
Test: run cts-on-gsi -m CtsAppExitTestCases
Change-Id: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
Merged-In: Id0001f8c4187a280cffe6c72d7a39be29065ca4e
2020-07-20 18:27:33 +00:00
Anton Hansson e6c24147f0 Remove vendor/... path checks DO NOT MERGE
The vendor path check is incompatible with the current setup of prebuilt
module stubs.

Bug: 160165426
Test: lunch mainline_system_x86 ; m nothing
Change-Id: I5aa809dc3e0c9b36e6963585bb60fd446a234022
2020-07-01 15:27:37 +01:00
Jooyung Han cd1aaed4f0 Merge "GSI: install flattened cts shim" into rvc-dev 2020-06-22 17:05:58 +00:00
Jooyung Han 15f9085595 GSI: install flattened cts shim
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.

Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
      # should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
2020-06-19 20:09:06 +09:00
yawanng 77107a17e5 iorap: Turn off pinner by default for large memory devices.
Bug: 157667363
Test: Make
Change-Id: I980a470596da3bf4e500bbd6c517e1a022c2d1a0
2020-06-19 00:47:17 +00:00
TreeHugger Robot aec1debc65 Merge "Skip mount /oem on GSI" into rvc-dev 2020-06-18 15:32:41 +00:00
Jing-yan, Jang dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
TreeHugger Robot ddca499c5c Merge "Remove ANGLE from base_system.mk" into rvc-dev 2020-06-17 20:34:06 +00:00
Tim Van Patten 25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
Steve Muckle a6da7bc44a enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-06-17 09:00:51 -07:00
SzuWei Lin 03a29a6974 Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f)
2020-06-17 18:18:20 +08:00
Steve Muckle 9c4a0ea67f add 4.19 kernel to aosp_arm64
Create a 4.19 kernel GKI boot image.

Bug: 158791155
Change-Id: I2dcfe29f2e8414c0362992a6e6ca68a86f367d4e
2020-06-16 17:49:18 -07:00
josephjang f829b2bc9f Identity: Add credstore
In order to support mDL on RVC, we need to
add credstore in /system/bin

Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
2020-06-16 14:04:00 +00:00
Colin Cross a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
TreeHugger Robot 0ffb2a8265 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev 2020-06-11 22:31:22 +00:00
yawanng 74800141bf iorap: Move the pinner property to product/build.prop
/system/build.prop must not be device-specific, it's for all Android targets.
The pinner.pin_camera=true is device-specific, so move it to /product/build.prop.

Bug: 158366075
Test: Make
Change-Id: Ie5cd37e09fe1d589ea619e6bb5edf807211d047f
2020-06-09 16:43:01 +00:00
TreeHugger Robot 7a726856a9 Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev 2020-06-09 11:14:45 +00:00
Josh Gao 76e974567c Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
(cherry picked from commit 67e0295833)
2020-06-08 14:07:02 -07:00
Dario Freni b586dba65a Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 18:44:52 +00:00
TreeHugger Robot 270308af15 Merge "iorap: Add a config mk for large memory device." into rvc-dev 2020-05-29 21:27:26 +00:00
Yan Wang ef60ddcf6a iorap: Add a config mk for large memory device.
Pinner for camera is turned on for large memory.

Bug: 157667363
Test: Make
Change-Id: I86be79f59fa5b569fbd4e68402d3ea1b9b62275f
2020-05-28 22:50:52 +00:00
David Zeuthen c599a2708f Merge "Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list" into rvc-dev 2020-05-28 22:04:19 +00:00
Chen Xu 18029ed3d2 Merge "support data migration by default" into rvc-dev 2020-05-28 00:24:29 +00:00
Chen Xu 9dfa9ec4ae support data migration by default
include stub cellbroadcat app for data preservation by dafault.

Bug: 155844209
Change-Id: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
Merged-in: I34d1978ce89f4d4edbf327a3b61f7fb87262aae0
2020-05-27 16:15:48 +00:00
Daniel Rosenberg 32be864b0e Disable sdcardfs from emulated_stroage.mk
This sets external_storage.sdcardfs.enabled=0 from emulated_storage.mk,
which will disable sdcardfs on devices that are using casefolding and
quotas as sdcardfs replacements. This allows the device to use these if
sdcardfs is present in the kernel.

Bug: 155222498
Test: mount|grep "type sdcardfs" should find nothing after boot complete
      if external_storage.sdcardfs.enabled=0
Change-Id: Id0446a7cac5ac768afc3b3e046359fc4e945e554
2020-05-20 04:50:06 +00:00
TreeHugger Robot 27e8474d57 Merge "support different boot partition sizes in aosp_arm64" into rvc-dev 2020-05-20 03:26:56 +00:00
Steve Muckle 53226684b9 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.

Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
Merged-In: I66b57de91042bfd56ba54a3659843d8cf7873955
2020-05-19 14:37:40 -07:00
Remi NGUYEN VAN 5f2e395212 Use NetworkStack on system image
Now that NetworkStack was bumped to API 30, use NetworkStack instead of
NetworkStackNext on the system image.

This change should not be merged in branches that are used for building
S system images for internal testing. Note that the merged-in change
is not related to this change; it is just used to prevent this change
from merging into the aosp/master merge path.

Bug: 143586229
Test: m
Merged-In: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
Change-Id: I484e148fab80a01d2b20ebf48604d9e923fe7cd3
2020-05-19 09:56:57 +00:00
David Zeuthen a911c7ced7 Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list
Bug: 156076333
Bug: 154631410
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: Iac45277dd49b43b92da91139de056d44ff1e041f
2020-05-18 16:55:50 -04:00
TreeHugger Robot 2fc5a393e0 Merge "Enables signing for generic boot images" into rvc-dev 2020-05-18 05:32:35 +00:00
TreeHugger Robot 2cde78687d Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into rvc-dev 2020-05-18 04:16:41 +00:00
Roman Kiryanov 95de4601b9 Import the d/g/goldfish soong namespace for libwifi-hal-emu
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
2020-05-14 13:22:44 -07:00
SzuWei Lin de9dc88b59 Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk
BOARD_EXT4_SHARE_DUP_BLOCKS can reduce the image size. Move it to
BoardConfigMainlineCommon.mk to apply on all mainline based
targets.

Bug: 155589918
Test: build aosp_arm-userdebug
Test: build gsi_gms_arm64-userdebug
Test: build sdk_gphone_arm64-userdebug
Change-Id: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
2020-05-14 16:26:55 +08:00
Bowgo Tsai d55fbd365a Enables signing for generic boot images
Enables signing for them so we can verify that the boot partition
contains a valid generic boot image during the compliance test.

This change also adds the chained partition descriptor of
boot partition into vbmeta.img, which contains the corresponding
public key used to verify the boot partition.

Bug: 151094943
Test: lunch aosp_arm64-user, `make` and use `avbtool info_image`
      to check that GKI images are properly signed.
Test: `make dist` and checks that GKI images in the image zip file
      are properly signed.
Change-Id: I2fd69964f9dc62526a813875fa9193913aa4935b
Merged-In: I2fd69964f9dc62526a813875fa9193913aa4935b
(cherry picked from commit 0f95ac7e8c)
2020-05-14 13:01:37 +08:00
TreeHugger Robot 4d8e9cc847 Merge changes from topic "nonab_on_vab_r" into rvc-dev
* changes:
  Use add_slot_suffix function in edify script
  Support forcefully generating non-AB packages.
2020-05-13 17:26:44 +00:00
Yifan Hong 7169f754cc Support forcefully generating non-AB packages.
Force generate a non-A/B update package when requested.

Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well

Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
2020-05-07 12:48:17 -07:00
Pete Bentley c85cd10008 Add boringssl_self_test to base PRODUCT_PACKAGES.
When building from source this gets installed as a requirement
from Conscrypt, but needs to be present when Conscrypt is
shipped as a pre-built too.

I think the correct solution here is actually to make libcrypto
rather than Conscrypt require boringssl_self_test but Soong
considers that a circular dependency.

Bug: 155520949
Test: m installclean && m

Change-Id: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
Merged-In: I77b2921d1d7b6be493cd581c46adbadd1f186fb0
(cherry picked from commit f5a05c4a4b)
2020-05-07 18:28:17 +01:00
Mark Chien 6e9704ed5c Merge "Build com.android.inprocess.tethering for Go variant" into rvc-dev 2020-05-07 15:15:59 +00:00
markchien d70896c24a Build com.android.inprocess.tethering for Go variant
Bug: 155604224
Test: build
Change-Id: I1c5ac07e72068a617fa20797496dd022f279d88e
2020-05-07 20:07:42 +08:00
Dmitri Plotnikov b99d94f9b2 Remove service-jobscheduler and service-blobstore from SERVICECLASSPATH
Test: atest android.jobscheduler.cts
Bug: 155631167
Change-Id: I5873c15513cfc63771e7d5c73791708105dff002
2020-05-05 13:28:34 -07:00
Svet Ganov c3b0b52e58 Updating platform SDK version for R
* Update SDK level and make REL
  * Update GSI lib list

Test: build + boot

bug:150281259

Change-Id: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
Merged-In: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
2020-05-03 09:40:27 -07:00
Bo Hu 4d6f4f6c9e emulator: enable vendor boot image
BUG: 149826779
Test: Build x86, x86_64, armv7 and arm64
make sure x86/64 boot to home screen;
armv7/arm64 can pass disk mounting stage

Change-Id: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
Merged-In: I258b69bd0cdc4fb0a99b1a04567051e8d32c389a
2020-05-01 20:01:40 +00:00
Jeongik Cha c8ba8c1b48 Move PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS to each devices(aosp targets)
Settings in aosp targets don't need to rely on static overlay.

Bug: 150820813
Bug: 152926806
Test: m
Change-Id: Ie41f881f1c48201db434605a03dbeb48149543b2
2020-04-30 06:34:41 +00:00
TreeHugger Robot 2f40f1727c Merge "enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64" into rvc-dev 2020-04-27 22:43:45 +00:00
Steve Muckle 125b6d6eea enable BOARD_EXT4_SHARE_DUP_BLOCKS for generic_arm64
Bug: 154907226
Change-Id: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
Merged-In: Iab55afbfaf7d28ac0e826f8eb94b113a2780a4c9
2020-04-27 13:52:28 -07:00
TreeHugger Robot 04735a8ef2 Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev
* changes:
  generate multiple boot.img files in aosp_arm64
  create emulator_arm64 device for sdk_phone_arm64 to use
  support multiple boot.img files in release tools
  multi boot.img support cleanups
2020-04-23 23:20:16 +00:00
TreeHugger Robot c0f3be1309 Merge "Make RRO packages for system_ext" into rvc-dev 2020-04-23 01:25:48 +00:00
Steve Muckle 4b6b2003a9 generate multiple boot.img files in aosp_arm64
Generate boot.img variants with different schemes for kernel compression
(gzip, lz4, none).

The boot image is removed from vbmeta for aosp_arm64 since it is
not possible currently to store the hashes of multiple variants of a
particular image. The GKI will be verified via VTS anyway.

Also remove some emulator-specific stuff from aosp_arm64.

Bug: 151094943
Change-Id: I465ea6c98d52e839284d51b246203f6b8dfb5566
Merged-In: I465ea6c98d52e839284d51b246203f6b8dfb5566
2020-04-22 11:48:52 -07:00
Steve Muckle 4bfa078008 create emulator_arm64 device for sdk_phone_arm64 to use
Changes are needed in generic_arm64 so that aosp_arm64 can be used to
distribute the GKI. These changes are incompatible with the emulator,
so modify the sdk_phone_arm64 product to use its own device.

Bug: 111538404
Change-Id: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
Merged-In: I57b77d7cbf503afffa8db45ad8b5ae635b4f4444
2020-04-22 11:48:14 -07:00
Victor Hsieh f17840d885 Add fsverity release cert
The release cert helps verifying CTS in a release build.

Bug: 153112812
Test: build, reboot, see a new key in /proc/keys
Change-Id: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
Merged-In: I6d8f4af6b1b0c023b668e81b7a1c71c7583d93d9
2020-04-21 15:03:41 -07:00