From 753351d46dd02897afd54428c209e4082bd911be Mon Sep 17 00:00:00 2001 From: matteo0026 Date: Mon, 22 Mar 2021 22:05:07 +0100 Subject: [PATCH] matissewifi: use default languages --- AndroidProducts.mk | 2 +- BoardConfig.mk | 8 +++----- device.mk | 18 +++++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9795cde..c978c65 100644 --- a/AndroidProducts.mk +++ b/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 \ diff --git a/BoardConfig.mk b/BoardConfig.mk index 5c5dcb5..37ea978 100644 --- a/BoardConfig.mk +++ b/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 diff --git a/device.mk b/device.mk index 45c2dcc..9640071 100644 --- a/device.mk +++ b/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)