PL2: Sort makefile and organize

Change-Id: Ia1b6cd06dcd86670289506ae6dfc570c8dc6973b
This commit is contained in:
Nolen Johnson
2023-11-27 22:53:28 -05:00
parent 698eaf74f7
commit 9298d8373a
6 changed files with 43 additions and 63 deletions

View File

@@ -23,8 +23,9 @@ DEVICE_PATH := device/nokia/PL2
TARGET_CPU_VARIANT := cortex-a53
TARGET_2ND_CPU_VARIANT := cortex-a53
# Assert
# Assertions
TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
TARGET_OTA_ASSERT_DEVICE := PL2,PL2_sprout,Plate2
# Bootloader
TARGET_BOOTLOADER_BOARD_NAME := sdm630

View File

@@ -13,19 +13,46 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Vendor blobs
$(call inherit-product, vendor/nokia/PL2/PL2-vendor.mk)
# Set Shipping API level
$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o.mk)
# Inherit from nokia sdm660-common
$(call inherit-product, device/nokia/sdm660-common/common.mk)
# setup dalvik vm configs
$(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay
# AAPT
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
# Boot Animation
TARGET_SCREEN_HEIGHT := 1920
TARGET_SCREEN_WIDTH := 1080
# Dalvik
$(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
# GMS
PRODUCT_GMS_CLIENTID_BASE := android-hmd
# Init
PRODUCT_PACKAGES += \
init.PL2.target.rc
# NFC
PRODUCT_PACKAGES += \
android.hardware.nfc@1.2-service \
android.hardware.nfc@1.2-service.samsung \
com.android.nfc_extras \
Tag
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
$(LOCAL_PATH)/configs/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
$(LOCAL_PATH)/configs/nfc/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
# Permissions
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
@@ -34,21 +61,5 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml
# NFC
PRODUCT_PACKAGES += \
android.hardware.nfc@1.2-service \
android.hardware.nfc@1.2-service.samsung \
Tag \
com.android.nfc_extras
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
$(LOCAL_PATH)/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
$(LOCAL_PATH)/nfc/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
# Ramdisk
PRODUCT_PACKAGES += \
init.PL2.target.rc
# Get non-open-source specific aspects
$(call inherit-product, vendor/nokia/PL2/PL2-vendor.mk)
# Inherit from nokia sdm660-common
$(call inherit-product, device/nokia/sdm660-common/common.mk)

View File

@@ -1,51 +1,19 @@
#
# Copyright (C) 2019 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Inherit some common AOSP stuff
# Inherit some common Lineage stuff
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, vendor/lineage/config/common_full_phone.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)
#nherit from PL2 device
# Device
$(call inherit-product, device/nokia/PL2/device.mk)
# AAPT
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
# Asserts
TARGET_OTA_ASSERT_DEVICE := PL2,PL2_sprout,Plate2
# Boot Animation
TARGET_SCREEN_HEIGHT := 1920
TARGET_SCREEN_WIDTH := 1080
PRODUCT_NAME := lineage_PL2
BUILD_FINGERPRINT := Nokia/Plate2_00WW/PL2_sprout:10/QKQ1.190828.002/00WW_4_15O:user/release-keys
PRODUCT_BRAND := Nokia
PRODUCT_DEVICE := PL2
PRODUCT_MANUFACTURER := HMD Global
PRODUCT_BRAND := Nokia
PRODUCT_MODEL := Nokia 6.1
PRODUCT_GMS_CLIENTID_BASE := android-hmd
PRODUCT_NAME := lineage_PL2
PRODUCT_BUILD_PROP_OVERRIDES += \
PRODUCT_DEVICE=PL2_sprout \
PRODUCT_NAME=Plate2_00WW \
PRIVATE_BUILD_DESC="Plate2_00WW-user 10 QKQ1.190828.002 00WW_4_15O release-keys"
BUILD_FINGERPRINT := Nokia/Plate2_00WW/PL2_sprout:10/QKQ1.190828.002/00WW_4_15O:user/release-keys