From 28d720dce6523ba2c6463f5eea32228e5fdd6c03 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Wed, 25 Oct 2023 14:57:24 +0100 Subject: [PATCH] radxa0: 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 --- AndroidProducts.mk | 11 +++-------- lineage_radxa0_tab.mk | 27 --------------------------- radxa0_tab/BoardConfig.mk | 1 - 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 lineage_radxa0_tab.mk delete mode 100644 radxa0_tab/BoardConfig.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 135a0e1..90cf86c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,18 +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_radxa0.mk \ - $(LOCAL_DIR)/lineage_radxa0_tab.mk + $(LOCAL_DIR)/lineage_radxa0.mk COMMON_LUNCH_CHOICES := \ lineage_radxa0-eng \ - lineage_radxa0_tab-eng \ lineage_radxa0-user \ - lineage_radxa0_tab-user \ - lineage_radxa0-userdebug \ - lineage_radxa0_tab-userdebug - + lineage_radxa0-userdebug diff --git a/lineage_radxa0_tab.mk b/lineage_radxa0_tab.mk deleted file mode 100644 index f3088ef..0000000 --- a/lineage_radxa0_tab.mk +++ /dev/null @@ -1,27 +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 := Radxa -PRODUCT_DEVICE := radxa0_tab -PRODUCT_MANUFACTURER := radxa -PRODUCT_MODEL := Radxa Zero -PRODUCT_NAME := lineage_radxa0_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/radxa0_tab/BoardConfig.mk b/radxa0_tab/BoardConfig.mk deleted file mode 100644 index df33e36..0000000 --- a/radxa0_tab/BoardConfig.mk +++ /dev/null @@ -1 +0,0 @@ -include device/radxa/radxa0/BoardConfig.mk -- 2.20.1