shipping level 31, and keep target-level as-is

PRODUCT_SHIPPING_API_LEVEL := 31
kernel target-level="6"
target-level="3" or ="4"

Bug: 167997902
Change-Id: I110e251a108bbca7b63cd90142c82b35e93287b7
This commit is contained in:
Robin Peng 2021-04-07 16:35:33 +08:00 committed by Alex Hong
parent 89f31f39c2
commit c5b41648b3
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 # Enable larger logbuf
BOARD_KERNEL_CMDLINE += log_buf_len=1024K 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 DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
# This will be updated to 31 (Android S) for shipping # This will be updated to 31 (Android S) for shipping
PRODUCT_SHIPPING_API_LEVEL := 30 PRODUCT_SHIPPING_API_LEVEL := 31
# 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
# Enforce the Product interface # Enforce the Product interface
PRODUCT_PRODUCT_VNDK_VERSION := current PRODUCT_PRODUCT_VNDK_VERSION := current