From: Bruno Martins <bgcngm@gmail.com> Date: Wed, 25 Oct 2023 13:57:24 +0000 (+0100) Subject: m5: Move tablet builds support to the proper tree X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2d34e651189084bbc5418ce4c858faa165ae912e;p=GitHub%2FLineageOS%2FG12%2Fandroid_device_bananapi_m5.git m5: Move tablet builds support to the proper tree Otherwise EPPE is broken since it expects the following path: device/*/$(LINEAGE_BUILD)/$(TARGET_PRODUCT).mk Change-Id: Iadef814f0a3bf4f1948da73b8fe437b10ebba8ed --- diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 771827e..d3df000 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,17 +1,13 @@ # -# Copyright (C) 2021 The LineageOS Project +# Copyright (C) 2021-2023 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/lineage_m5.mk \ - $(LOCAL_DIR)/lineage_m5_tab.mk COMMON_LUNCH_CHOICES := \ lineage_m5-eng \ - lineage_m5_tab-eng \ lineage_m5-user \ - lineage_m5_tab-user \ - lineage_m5-userdebug \ - lineage_m5_tab-userdebug + lineage_m5-userdebug diff --git a/lineage_m5_tab.mk b/lineage_m5_tab.mk deleted file mode 100644 index 44601f5..0000000 --- a/lineage_m5_tab.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2021-2023 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -# Inherit some common AOSP stuff -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) - -# Inherit some common Lineage stuff -$(call inherit-product, vendor/lineage/config/common_mini_tablet_wifionly.mk) - -# Inherit device configuration -$(call inherit-product, $(LOCAL_PATH)/device.mk) - -## Device identifier. This must come after all inclusions -PRODUCT_BRAND := bananapi -PRODUCT_DEVICE := m5_tab -PRODUCT_GMS_CLIENTID_BASE := android-askey-tv -PRODUCT_MANUFACTURER := bananapi -PRODUCT_MODEL := BPI-M5 -PRODUCT_NAME := lineage_m5_tab - -PRODUCT_BUILD_PROP_OVERRIDES += \ - PRODUCT_NAME=adt3 \ - PRIVATE_BUILD_DESC="adt3-user 11 RTT1.200909.003.A2 6832896 release-keys" - -BUILD_FINGERPRINT := ADT-3/adt3/adt3:11/RTT1.200909.003.A2/6832896:user/release-keys diff --git a/m5_tab/BoardConfig.mk b/m5_tab/BoardConfig.mk deleted file mode 100644 index 68bcee2..0000000 --- a/m5_tab/BoardConfig.mk +++ /dev/null @@ -1 +0,0 @@ -include device/bananapi/m5/BoardConfig.mk