Merge "Revert "Revert "Move PRODUCT_SHIPPING_API_LEVEL to defined by de..."" into main

This commit is contained in:
Treehugger Robot 2024-09-13 05:54:07 +00:00 committed by Android (Google) Code Review
commit 2ec8fd56a5

View file

@ -400,6 +400,8 @@ PRODUCT_VENDOR_PROPERTIES += \
# GRAPHICS - GPU (end) # GRAPHICS - GPU (end)
# #################### # ####################
PRODUCT_SHIPPING_API_LEVEL := $(SHIPPING_API_LEVEL)
# Device Manifest, Device Compatibility Matrix for Treble # Device Manifest, Device Compatibility Matrix for Treble
DEVICE_MANIFEST_FILE := \ DEVICE_MANIFEST_FILE := \
device/google/zumapro/manifest.xml device/google/zumapro/manifest.xml
@ -425,8 +427,6 @@ DEVICE_MATRIX_FILE := \
DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
PRODUCT_SHIPPING_API_LEVEL := 34
# RKP VINTF # RKP VINTF
-include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk -include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk