diff --git a/Android.mk b/Android.mk index 7405e71..a35105e 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),alioth) +ifeq ($(TARGET_DEVICE),pipa) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 64475a7..6433dd1 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,9 +5,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_alioth.mk + $(LOCAL_DIR)/lineage_pipa.mk COMMON_LUNCH_CHOICES := \ - lineage_alioth-user \ - lineage_alioth-userdebug \ - lineage_alioth-eng + lineage_pipa-user \ + lineage_pipa-userdebug \ + lineage_pipa-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 7ac7a74..1cb1c51 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -7,7 +7,7 @@ # Inherit from sm8250-common include device/xiaomi/sm8250-common/BoardConfigCommon.mk -DEVICE_PATH := device/xiaomi/alioth +DEVICE_PATH := device/xiaomi/pipa BUILD_BROKEN_DUP_RULES := true @@ -22,13 +22,10 @@ TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):init_xiaomi_alioth TARGET_RECOVERY_DEVICE_MODULES := init_xiaomi_alioth # Kernel -TARGET_KERNEL_CONFIG += vendor/xiaomi/alioth.config - -# OTA assert -TARGET_OTA_ASSERT_DEVICE := alioth,aliothin +TARGET_KERNEL_CONFIG += vendor/xiaomi/pipa.config # Properties TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop # Inherit from the proprietary version -include vendor/xiaomi/alioth/BoardConfigVendor.mk +include vendor/xiaomi/pipa/BoardConfigVendor.mk diff --git a/board-info.txt b/board-info.txt index b346d35..810cf08 100644 --- a/board-info.txt +++ b/board-info.txt @@ -1 +1 @@ -require board=alioth|aliothin +require board=pipa diff --git a/device.mk b/device.mk index e0f2b93..8beff86 100644 --- a/device.mk +++ b/device.mk @@ -42,4 +42,4 @@ PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) # Inherit from vendor blobs -$(call inherit-product, vendor/xiaomi/alioth/alioth-vendor.mk) +$(call inherit-product, vendor/xiaomi/pipa/pipa-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 705b7c5..9f7effb 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -36,7 +36,7 @@ fi set -e -export DEVICE=alioth +export DEVICE=pipa export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi diff --git a/lineage_alioth.mk b/lineage_alioth.mk deleted file mode 100644 index 8fd28ef..0000000 --- a/lineage_alioth.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2021 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -# Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) - -# Inherit some common lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) - -# Inherit from alioth device -$(call inherit-product, device/xiaomi/alioth/device.mk) - -PRODUCT_NAME := lineage_alioth -PRODUCT_DEVICE := alioth -PRODUCT_MANUFACTURER := Xiaomi -PRODUCT_BRAND := POCO -PRODUCT_MODEL := POCO F3 - -PRODUCT_GMS_CLIENTID_BASE := android-xiaomi - -BUILD_FINGERPRINT := POCO/alioth_global/alioth:13/TKQ1.220829.002/V14.0.4.0.TKHMIXM:user/release-keys diff --git a/lineage_pipa.mk b/lineage_pipa.mk new file mode 100644 index 0000000..40aba20 --- /dev/null +++ b/lineage_pipa.mk @@ -0,0 +1,27 @@ +# +# Copyright (C) 2021 The LineageOS Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +# Inherit from those products. Most specific first. +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) + +# Inherit some common lineage stuff. +$(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk) + +# Inherit from pipa device +$(call inherit-product, device/xiaomi/pipa/device.mk) + +PRODUCT_NAME := lineage_pipa +PRODUCT_DEVICE := pipa +PRODUCT_MANUFACTURER := Xiaomi +PRODUCT_BRAND := Xiaomi +PRODUCT_MODEL := 23043RP34G + +PRODUCT_CHARACTERISTICS := tablet + +PRODUCT_GMS_CLIENTID_BASE := android-xiaomi + +BUILD_FINGERPRINT := Xiaomi/pipa_global/pipa:13/RKQ1.211001.001/V816.0.7.0.UMZMIXM:user/release-keys diff --git a/setup-makefiles.sh b/setup-makefiles.sh index eac61fa..8a0385c 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -7,7 +7,7 @@ set -e -export DEVICE=alioth +export DEVICE=pipa export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi