From aaaba5f297e77b635d47f46b1db7f8efd89faf47 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Wed, 22 Sep 2021 19:11:04 +0200 Subject: [PATCH] miatoll: Move common tree and shipping product API prop to the top Change-Id: I6fe21526ece548b49ab6891d99abb0057a304f02 --- device.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/device.mk b/device.mk index b6c2cfa..b2ade9f 100644 --- a/device.mk +++ b/device.mk @@ -4,6 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # +# Inherit from sm6250-common +$(call inherit-product, device/xiaomi/sm6250-common/atoll.mk) + +PRODUCT_SHIPPING_API_LEVEL := 29 + # Overlays DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay @@ -16,8 +21,6 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi TARGET_SCREEN_HEIGHT := 2400 TARGET_SCREEN_WIDTH := 1080 -PRODUCT_SHIPPING_API_LEVEL := 29 - # NFC PRODUCT_PACKAGES += \ NfcNci \ @@ -52,8 +55,5 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/thermal-engine-gram.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-gram.conf \ $(LOCAL_PATH)/configs/thermal-engine-joyeuse.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-joyeuse.conf -# Inherit from sm6250-common -$(call inherit-product, device/xiaomi/sm6250-common/atoll.mk) - # Inherit proprietary targets $(call inherit-product, vendor/xiaomi/miatoll/miatoll-vendor.mk)