sm8150-common: update for new oneplus common tree

Signed-off-by: Omkar Chandorkar <[email protected]>

BoardConfigCommon.mk

@@ -68,23 +68,19 @@ BOARD_SUPPORTS_SOUND_TRIGGER := true
 USE_CUSTOM_AUDIO_POLICY := 1
 
 # FOD
-TARGET_SURFACEFLINGER_FOD_LIB := //$(VENDOR_PATH):libfod_extension.oneplus_msmnile
+TARGET_USES_FOD_ZPOS := true
+TARGET_SURFACEFLINGER_UDFPS_LIB := //device/oneplus/common:libudfps_extension.oneplus
 
 # Display
 MAX_VIRTUAL_DISPLAY_DIMENSION := 4096
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true
 TARGET_USES_DISPLAY_RENDER_INTENTS := true
 TARGET_USES_DRM_PP := true
-TARGET_USES_FOD_ZPOS := true
 TARGET_USES_GRALLOC1 := true
 TARGET_USES_HWC2 := true
 TARGET_USES_ION := true
 
-# Fingerprint
-SOONG_CONFIG_NAMESPACES += ONEPLUS_MSMNILE_FOD
-SOONG_CONFIG_ONEPLUS_MSMNILE_FOD := POS_X POS_Y SIZE
-
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \
     $(VENDOR_PATH)/oneplus_vendor_framework_compatibility_matrix.xml

common.mk

@@ -18,6 +18,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     AOSPAOnePlusSM8150Frameworks \
     AOSPAOnePlusSM8150SystemUI \
+    OnePlusFrameworksOverlay \
     OnePlusSM8150Frameworks \
     OnePlusSM8150Settings \
     OnePlusSM8150SystemUI
@@ -199,6 +200,7 @@ PRODUCT_PACKAGES += \
     [email protected] \
     [email protected] \
     [email protected] \
+    [email protected] \
     vendor.qti.hardware.display.allocator-service \
     [email protected] \
     [email protected] \
@@ -216,10 +218,8 @@ PRODUCT_PACKAGES += \
 
 # Fingerprint
 PRODUCT_PACKAGES += \
-    [email protected]_msmnile \
-    [email protected] \
-    [email protected] \
-    [email protected]
+    [email protected] \
+    [email protected]:64
 
 # GPS
 PRODUCT_COPY_FILES += \
@@ -292,13 +292,6 @@ PRODUCT_PACKAGES += \
     libstagefrighthw \
     libstagefright_softomx.vendor
 
-# OnePlus
-PRODUCT_PACKAGES += \
-    oneplus-fwk.oneplus_msmnile
-
-PRODUCT_BOOT_JARS += \
-    oneplus-fwk.oneplus_msmnile
-
 # Platform
 TARGET_BOARD_PLATFORM := msmnile
 
@@ -312,7 +305,7 @@ TARGET_COMMON_QTI_COMPONENTS := \
 
 # Vibrator
 PRODUCT_PACKAGES += \
-    vendor.qti.hardware.vibrator.service.oneplus_msmnile
+    vendor.qti.hardware.vibrator.service.oneplus
 
 PRODUCT_COPY_FILES += \
     vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml
@@ -337,7 +330,8 @@ PRODUCT_PACKAGES += \
 
 # tri-state key
 PRODUCT_PACKAGES += \
-    tri-state-key_daemon
+    tri-state-key_daemon \
+    TriStateHandler
 
 # Update engine
 PRODUCT_PACKAGES += \