Downgrade the PRODUCT_SHIPPING_API_LEVEL from 31 to 30

We should wait for the Android SC SDK finalization.
Remove the unnecessary "BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE".

Test: Build successfully and the device is bootable
      CtsOsTestCases: android.os.cts.BuildTest#testSdkInt pass
Bug: 187023500
Change-Id: Ib9adbb7a7c913790994a06ae1a57f95eebf84a78
This commit is contained in:
Alex Hong 2021-05-05 19:03:04 +08:00
parent 69bc91e5f0
commit 2f8fde91a1
2 changed files with 1 additions and 4 deletions

View file

@ -408,6 +408,3 @@ 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

@ -170,7 +170,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 := 31 PRODUCT_SHIPPING_API_LEVEL := 30
# Temporarily disable the debugfs restriction on 31 (Android S) # Temporarily disable the debugfs restriction on 31 (Android S)
PRODUCT_SET_DEBUGFS_RESTRICTIONS := false PRODUCT_SET_DEBUGFS_RESTRICTIONS := false