matissewifi: use default languages

AndroidProducts.mk

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_matissewifi.mk
+    device/samsung/matissewifi/lineage_matissewifi.mk
 
 COMMON_LUNCH_CHOICES := \
     lineage_matissewifi-user \

BoardConfig.mk

@@ -16,19 +16,17 @@
 # inherit from common matisse
 include device/samsung/matisse-common/BoardConfigCommon.mk
 
-DEVICE_PATH := device/samsung/matissewifi
-
 # Assert
-TARGET_OTA_ASSERT_DEVICE := matissewifi
+TARGET_OTA_ASSERT_DEVICE := matisse,matissewifi,matissewifiue
 
 # Kernel
 TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig
 
 # HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
+DEVICE_MANIFEST_FILE += device/samsung/matissewifi/manifest.xml
 
 # SELinux
-include $(DEVICE_PATH)/sepolicy/sepolicy.mk
+include device/samsung/matissewifi/sepolicy/sepolicy.mk
 
 # inherit from the proprietary version
 -include vendor/samsung/matissewifi/BoardConfigVendor.mk

device.mk

@@ -15,22 +15,22 @@
 # limitations under the License.
 #
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
+
+# IR Blaster
+PRODUCT_PACKAGES += \
+    android.hardware.ir@1.0-service.samsung
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-
-# Soong namespaces
-PRODUCT_SOONG_NAMESPACES += \
-    $(LOCAL_PATH)
+DEVICE_PACKAGE_OVERLAYS += device/samsung/matissewifi/overlay
 
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml
 
-# IR Blaster
-PRODUCT_PACKAGES += \
-    android.hardware.ir@1.0-service.samsung
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += \
+    $(LOCAL_PATH)
 
 # Get non-open-source specific aspects
 $(call inherit-product-if-exists, vendor/samsung/matissewifi/matissewifi-vendor.mk)