shipping level 31, and keep target-level as-is am: c5b41648b3

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13839236

Change-Id: Iffb576e12c7390694b9dc5884faec25ee783472b
This commit is contained in:
Robin Peng 2021-04-27 07:36:07 +00:00 committed by Automerger Merge Worker
commit fddf468e79
2 changed files with 4 additions and 5 deletions

View file

@ -407,3 +407,6 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
# Enable larger logbuf
BOARD_KERNEL_CMDLINE += log_buf_len=1024K
# Temporarily ignore the vendor selinux context namespace problem for PRODUCT_SHIPPING_API_LEVEL 31
BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true

View file

@ -159,11 +159,7 @@ DEVICE_MATRIX_FILE := \
DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
# This will be updated to 31 (Android S) for shipping
PRODUCT_SHIPPING_API_LEVEL := 30
# Do not enforce the kernel requirement temporarily since it is not ready
# Eventually this configuration should be removed
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
PRODUCT_SHIPPING_API_LEVEL := 31
# Enforce the Product interface
PRODUCT_PRODUCT_VNDK_VERSION := current