klte-common: Sort makefile sections sanely
Change-Id: Idb20e4befc873925003f2ede74c154aba2417d99
This commit is contained in:
Kevin F. Haggerty
parent
3c4c6b5df6
commit
adf0999b2a
2 changed files with 57 additions and 61 deletions
|
|
@ -20,27 +20,9 @@ LOCAL_PATH := device/samsung/klte-common
|
|||
|
||||
TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
|
||||
|
||||
# Use Snapdragon LLVM if available on build server
|
||||
TARGET_USE_SDCLANG := true
|
||||
|
||||
# ADB Legacy Interface
|
||||
TARGET_USES_LEGACY_ADB_INTERFACE := true
|
||||
|
||||
# Bootloader
|
||||
TARGET_BOOTLOADER_BOARD_NAME := MSM8974
|
||||
|
||||
# Kernel
|
||||
BOARD_KERNEL_BASE := 0x00000000
|
||||
BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 zcache.enabled=1 zcache.compressor=lz4 androidboot.bootdevice=msm_sdcc.1
|
||||
BOARD_KERNEL_IMAGE_NAME := zImage
|
||||
BOARD_KERNEL_PAGESIZE := 2048
|
||||
BOARD_KERNEL_SEPARATED_DT := true
|
||||
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01e00000
|
||||
BOARD_CUSTOM_BOOTIMG := true
|
||||
BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
|
||||
LZMA_RAMDISK_TARGETS := recovery
|
||||
TARGET_KERNEL_SOURCE := kernel/samsung/msm8974
|
||||
|
||||
# Audio
|
||||
BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
|
||||
USE_CUSTOM_AUDIO_POLICY := 1
|
||||
|
|
@ -54,6 +36,9 @@ BOARD_CUSTOM_BT_CONFIG := $(LOCAL_PATH)/bluetooth/vnd_klte.txt
|
|||
BOARD_HAVE_BLUETOOTH_BCM := true
|
||||
BOARD_HAVE_SAMSUNG_BLUETOOTH := true
|
||||
|
||||
# Bootloader
|
||||
TARGET_BOOTLOADER_BOARD_NAME := MSM8974
|
||||
|
||||
# Camera
|
||||
TARGET_HAS_LEGACY_CAMERA_HAL1 := true
|
||||
USE_DEVICE_SPECIFIC_CAMERA := true
|
||||
|
|
@ -67,6 +52,18 @@ TARGET_KERNEL_HAVE_EXFAT := true
|
|||
# HIDL
|
||||
DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml
|
||||
|
||||
# Kernel
|
||||
BOARD_KERNEL_BASE := 0x00000000
|
||||
BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 zcache.enabled=1 zcache.compressor=lz4 androidboot.bootdevice=msm_sdcc.1
|
||||
BOARD_KERNEL_IMAGE_NAME := zImage
|
||||
BOARD_KERNEL_PAGESIZE := 2048
|
||||
BOARD_KERNEL_SEPARATED_DT := true
|
||||
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x01e00000
|
||||
BOARD_CUSTOM_BOOTIMG := true
|
||||
BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
|
||||
LZMA_RAMDISK_TARGETS := recovery
|
||||
TARGET_KERNEL_SOURCE := kernel/samsung/msm8974
|
||||
|
||||
# Legacy BLOB Support
|
||||
TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS := true
|
||||
|
||||
|
|
@ -107,6 +104,9 @@ ifeq ($(WITH_TWRP),true)
|
|||
-include $(LOCAL_PATH)/twrp.mk
|
||||
endif
|
||||
|
||||
# Use Snapdragon LLVM if available on build server
|
||||
TARGET_USE_SDCLANG := true
|
||||
|
||||
# Wifi
|
||||
BOARD_HAVE_SAMSUNG_WIFI := true
|
||||
BOARD_WLAN_DEVICE := bcmdhd
|
||||
|
|
|
|||
82
klte.mk
82
klte.mk
|
|
@ -16,9 +16,8 @@
|
|||
#
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
|
||||
|
||||
# Get non-open-source specific aspects
|
||||
$(call inherit-product-if-exists, vendor/samsung/klte-common/klte-common-vendor.mk)
|
||||
$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-dalvik-heap.mk)
|
||||
$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk)
|
||||
|
||||
# Overlays
|
||||
DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
|
||||
|
|
@ -27,34 +26,11 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
|
|||
# System properties
|
||||
-include $(LOCAL_PATH)/system_prop.mk
|
||||
|
||||
# Device uses high-density artwork where available
|
||||
PRODUCT_AAPT_CONFIG := normal
|
||||
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
|
||||
|
||||
# Boot animation
|
||||
TARGET_SCREEN_HEIGHT := 1920
|
||||
TARGET_SCREEN_WIDTH := 1080
|
||||
TARGET_BOOTANIMATION_HALF_RES := true
|
||||
|
||||
$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-dalvik-heap.mk)
|
||||
|
||||
$(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk)
|
||||
|
||||
# Permissions
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
|
||||
frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \
|
||||
frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:system/etc/permissions/android.hardware.sensor.stepcounter.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:system/etc/permissions/android.hardware.sensor.stepdetector.xml \
|
||||
frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
|
||||
frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
|
||||
frameworks/native/data/etc/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
|
||||
frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
|
||||
|
||||
# Audio
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
|
||||
|
|
@ -62,18 +38,6 @@ PRODUCT_COPY_FILES += \
|
|||
$(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \
|
||||
$(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
|
||||
|
||||
# GPS
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.gnss@1.0-impl \
|
||||
gps.msm8974
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/configs/clatd.conf:system/etc/clatd.conf \
|
||||
$(LOCAL_PATH)/configs/flp.conf:system/etc/flp.conf \
|
||||
$(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf \
|
||||
$(LOCAL_PATH)/configs/izat.conf:system/etc/izat.conf \
|
||||
$(LOCAL_PATH)/configs/sap.conf:system/etc/sap.conf
|
||||
|
||||
# Bluetooth
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.bluetooth@1.0-impl \
|
||||
|
|
@ -93,6 +57,10 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
android.hardware.drm@1.0-impl
|
||||
|
||||
# Device uses high-density artwork where available
|
||||
PRODUCT_AAPT_CONFIG := normal
|
||||
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
|
||||
|
||||
# Doze
|
||||
PRODUCT_PACKAGES += \
|
||||
SamsungDoze
|
||||
|
|
@ -106,6 +74,18 @@ PRODUCT_PACKAGES += \
|
|||
PRODUCT_PACKAGES += \
|
||||
FlipFlap
|
||||
|
||||
# GPS
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.gnss@1.0-impl \
|
||||
gps.msm8974
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/configs/clatd.conf:system/etc/clatd.conf \
|
||||
$(LOCAL_PATH)/configs/flp.conf:system/etc/flp.conf \
|
||||
$(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf \
|
||||
$(LOCAL_PATH)/configs/izat.conf:system/etc/izat.conf \
|
||||
$(LOCAL_PATH)/configs/sap.conf:system/etc/sap.conf
|
||||
|
||||
# IPv6 tethering
|
||||
PRODUCT_PACKAGES += \
|
||||
ebtables \
|
||||
|
|
@ -138,6 +118,21 @@ PRODUCT_PACKAGES += \
|
|||
NfcNci \
|
||||
Tag
|
||||
|
||||
# Permissions
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
|
||||
frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \
|
||||
frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:system/etc/permissions/android.hardware.sensor.stepcounter.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:system/etc/permissions/android.hardware.sensor.stepdetector.xml \
|
||||
frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
|
||||
frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
|
||||
frameworks/native/data/etc/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
|
||||
frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
|
||||
|
||||
# Radio
|
||||
PRODUCT_PACKAGES += \
|
||||
libsecnativefeature \
|
||||
|
|
@ -169,13 +164,11 @@ PRODUCT_PACKAGES += \
|
|||
|
||||
# Wifi
|
||||
PRODUCT_PACKAGES += \
|
||||
libnetcmdiface \
|
||||
macloader
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
hostapd \
|
||||
hostapd.accept \
|
||||
hostapd.deny \
|
||||
hostapd \
|
||||
libnetcmdiface \
|
||||
macloader \
|
||||
wpa_supplicant \
|
||||
wpa_supplicant.conf
|
||||
|
||||
|
|
@ -183,5 +176,8 @@ PRODUCT_COPY_FILES += \
|
|||
$(LOCAL_PATH)/configs/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
$(LOCAL_PATH)/configs/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf
|
||||
|
||||
# Get non-open-source specific aspects
|
||||
$(call inherit-product-if-exists, vendor/samsung/klte-common/klte-common-vendor.mk)
|
||||
|
||||
# common msm8974
|
||||
$(call inherit-product, device/samsung/msm8974-common/msm8974.mk)
|
||||
|
|
|
|||
Loading…
Reference in a new issue