common: Simplify treble buildvars, add VNDK pkg

Since all devices are now fully treble compatible, we can enable
PRODUCT_FULL_TREBLE_OVERRIDE.

PRODUCT_FULL_TREBLE_OVERRIDE sets:
- PRODUCT_TREBLE_LINKER_NAMESPACES
- PRODUCT_SEPOLICY_SPLIT
- PRODUCT_ENFORCE_VINTF_MANIFEST
- PRODUCT_NOTICE_SPLIT
And also BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED indirectly.

Setting PRODUCT_USE_VNDK_OVERRIDE is still needed because
PRODUCT_USE_VNDK will only be set based on PRODUCT_FULL_TREBLE if the
shipping API level is 27 or greater.

Also add vndk_package in common so that devices don't need to add it
individually.

We might get rid of these vars entirely by inheriting products from
build/make/product/ at a later date.

1 files changed, 11 insertions, 9 deletions

diff --git a/common.mk b/common.mk
index 25e60fd..eaf84e8 100644
--- a/common.mk
+++ b/common.mk
@@ -33,17 +33,19 @@ PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI
 
-# Treble properties
-
-# Match running HAL services against vintf manifest
-PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
+# Force using the following regardless of shipping API level:
+#   PRODUCT_TREBLE_LINKER_NAMESPACES
+#   PRODUCT_SEPOLICY_SPLIT
+#   PRODUCT_ENFORCE_VINTF_MANIFEST
+#   PRODUCT_NOTICE_SPLIT
+PRODUCT_FULL_TREBLE_OVERRIDE := true
+
+# VNDK
 # Force using VNDK regardless of shipping API level
 PRODUCT_USE_VNDK_OVERRIDE := true
-# Force split of sepolicy into /system/etc/selinux and (/system)/vendor/etc/selinux
-# for all devices, regardless of shipping API level
-PRODUCT_SEPOLICY_SPLIT_OVERRIDE := true
-# Force moving all vendor props into /vendor/build.prop
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+# Include vndk/vndk-sp/ll-ndk modules
+PRODUCT_PACKAGES += \
+    vndk_package
 
 # Force building a recovery image: Needed for OTA packaging to work since Q
 PRODUCT_BUILD_RECOVERY_IMAGE := true