Merge pull request #633 from ix5/product-build-recovery

[Q-COMPAT] common: Set PRODUCT_BUILD_RECOVERY_IMAGE=true

common.mk

@@ -37,18 +37,23 @@ PRODUCT_ENFORCE_RRO_TARGETS := \
     Telephony \
     framework-res
 
-PRODUCT_USE_VNDK_OVERRIDE := true
-
 PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI
 
-PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
+# Treble properties
 
+# Match running HAL services against vintf manifest
+PRODUCT_ENFORCE_VINTF_MANIFEST_OVERRIDE := true
+# 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
 
+# Force building a recovery image: Needed for OTA packaging to work since Q
+PRODUCT_BUILD_RECOVERY_IMAGE := true
+
 BUILD_KERNEL := true
 -include $(KERNEL_PATH)/common-headers/KernelHeaders.mk