marlin/sailfish: Build the vendor image

This is a squash of the following commits:

  Author: razorloves <[email protected]>
  Date:   Mon Jan 28 01:37:33 2019 -0600
      marlin: Build the vendor image
      Change-Id: I372eacaae36a3c0e2a7f5e5eff45f0a9186ae427

  Author: razorloves <[email protected]>
  Date:   Mon Jan 28 06:20:10 2019 -0600
      marlin: Add some missing packages and props
      Change-Id: I2ac172bdd58310cc8c8473545ff64df1a3074bc7

  Author: razorloves <[email protected]>
  Date:   Thu Feb 28 20:17:12 2019 -0600
      marlin: Setup separate extract scripts for marlin and sailfish
      Change-Id: Ifc608ebea43d0b0326d67c763cb77a9a41967d6e

  Author: razorloves <[email protected]>
  Date:   Sat Mar 9 00:54:50 2019 -0600
      marlin/sailfish: Update proprietary files
      Change-Id: Ifc131f98803f874be1bede3d2756709bc4b68dc2

Change-Id: I372eacaae36a3c0e2a7f5e5eff45f0a9186ae427

Android.mk

@@ -39,4 +39,14 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
 
+DM_LIBS := libdmengine.so libdmjavaplugin.so
+DM_SYMLINKS := $(addprefix $(TARGET_OUT)/priv-app/DMService/lib/arm/,$(notdir $(DM_LIBS)))
+$(DM_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+	@echo "DMService lib link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /system/lib/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(DM_SYMLINKS)
+
 endif

BoardConfigLineage.mk

@@ -1,9 +1,11 @@
 # Common board config for marlin, sailfish
 
+# Build vendor image
+BOARD_VENDORIMAGE_PARTITION_SIZE := 314572800
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+
 # Kernel
 BOARD_KERNEL_IMAGE_NAME := Image.lz4-dtb
 TARGET_COMPILE_WITH_MSM_KERNEL := true
 TARGET_KERNEL_CONFIG := lineageos_marlin_defconfig
 TARGET_KERNEL_SOURCE := kernel/google/marlin
-
--include vendor/google/marlin/BoardConfigVendor.mk

device-lineage.mk

@@ -1,3 +1,18 @@
+# Build vendor img
+AB_OTA_PARTITIONS += vendor
+
+# Camera
+PRODUCT_PACKAGES += \
+    libmm-qcamera
+
+# DRM
+PRODUCT_PACKAGES += \
+    [email protected]
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    drm.service.enabled=true \
+    media.mediadrmservice.enable=true
+
 # Google Assistant
 PRODUCT_PRODUCT_PROPERTIES += ro.opa.eligible_device=true
 
@@ -9,3 +24,11 @@ PRODUCT_PACKAGES += \
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-lineage
+
+# Sensors
+PRODUCT_PACKAGES += \
+    libsensorndkbridge
+
+# Tool
+PRODUCT_PACKAGES += \
+    libtinyxml

extract-files.sh

@@ -0,0 +1 @@
+marlin/extract-files.sh

lineage_sailfish.mk

@@ -23,4 +23,4 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
 
 BUILD_FINGERPRINT := google/sailfish/sailfish:10/QP1A.190711.020/5800535:user/release-keys
 
-$(call inherit-product-if-exists, vendor/google/marlin/marlin-vendor.mk)
+$(call inherit-product-if-exists, vendor/google/sailfish/sailfish-vendor.mk)

marlin/BoardConfig.mk

@@ -102,7 +102,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist
 BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp
 
 BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy
-ifneq ($(filter marlin marlinf, $(TARGET_PRODUCT)),)
+ifneq ($(filter lineage_marlin marlin marlinf, $(TARGET_PRODUCT)),)
 BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
 endif
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/marlin/sepolicy/public

marlin/BoardConfigLineage.mk

@@ -1,2 +1,4 @@
 # BoardConfig for lineage_marlin
 include device/google/marlin/BoardConfigLineage.mk
+
+-include vendor/google/marlin/BoardConfigVendor.mk