MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 2ae50fe9fd on remote branch

Browse source 
Change-Id: I84e1b9035dd6405a679a4432fdeeda8c83e1954a
This commit is contained in:
Linux Build Service Account 2017-04-26 05:53:00 -07:00
commit 54c361ee5d
5 changed files with 221 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AndroidBoard.mk
View file

@ -19,7 +19,11 @@ endif
# Compile Linux Kernel # Compile Linux Kernel
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq ($(KERNEL_DEFCONFIG),) ifeq ($(KERNEL_DEFCONFIG),)
KERNEL_DEFCONFIG := sdm660_defconfig ifeq ($(TARGET_BUILD_VARIANT),user)
KERNEL_DEFCONFIG := sdm660-perf_defconfig
else
KERNEL_DEFCONFIG := sdm660_defconfig
endif
endif endif
ifeq ($(TARGET_KERNEL_SOURCE),) ifeq ($(TARGET_KERNEL_SOURCE),)

20
BoardConfig.mk
View file

@ -22,8 +22,6 @@ TARGET_2ND_CPU_VARIANT := cortex-a53
ifeq ($(TARGET_USES_AOSP), true) ifeq ($(TARGET_USES_AOSP), true)
TARGET_HW_DISK_ENCRYPTION := false TARGET_HW_DISK_ENCRYPTION := false
else else
# SDClang configuration
SDCLANG := true
#Enable HW based full disk encryption #Enable HW based full disk encryption
TARGET_HW_DISK_ENCRYPTION := true TARGET_HW_DISK_ENCRYPTION := true
endif endif
@ -31,6 +29,7 @@ endif
TARGET_NO_BOOTLOADER := false TARGET_NO_BOOTLOADER := false
TARGET_USES_UEFI := true TARGET_USES_UEFI := true
TARGET_NO_KERNEL := false TARGET_NO_KERNEL := false
-include $(QCPATH)/common/sdm660_64/BoardConfigVendor.mk -include $(QCPATH)/common/sdm660_64/BoardConfigVendor.mk
MINIMAL_FONT_FOOTPRINT := true MINIMAL_FONT_FOOTPRINT := true
@ -54,6 +53,11 @@ AB_OTA_PARTITIONS ?= boot system
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
TARGET_NO_RECOVERY := true TARGET_NO_RECOVERY := true
BOARD_USES_RECOVERY_AS_BOOT := true BOARD_USES_RECOVERY_AS_BOOT := true
ifeq ($(ENABLE_VENDOR_IMAGE), true)
TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery_vendor_variant.fstab
else
TARGET_RECOVERY_FSTAB := device/qcom/sdm660_64/recovery.fstab
endif
ifneq ($(AB_OTA_UPDATER),true) ifneq ($(AB_OTA_UPDATER),true)
TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_msm
@ -65,6 +69,13 @@ BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432
BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64)
ifeq ($(ENABLE_VENDOR_IMAGE), true)
BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_COPY_OUT_VENDOR := vendor
VENDOR_FSTAB_ENTRY := "/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,verify"
endif
# Enable suspend during charger mode # Enable suspend during charger mode
BOARD_CHARGER_ENABLE_SUSPEND := true BOARD_CHARGER_ENABLE_SUSPEND := true
@ -82,7 +93,7 @@ ifeq ($(TARGET_KERNEL_VERSION),4.4)
else else
BOARD_KERNEL_CMDLINE += console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 earlycon=msm_hsl_uart,0xc1b0000 BOARD_KERNEL_CMDLINE += console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 earlycon=msm_hsl_uart,0xc1b0000
endif endif
BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.selinux=permissive
endif endif
BOARD_EGL_CFG := device/qcom/sdm660_64/egl.cfg BOARD_EGL_CFG := device/qcom/sdm660_64/egl.cfg
@ -154,3 +165,6 @@ TARGET_USES_IMS := true
#Add NON-HLOS files for ota upgrade #Add NON-HLOS files for ota upgrade
ADD_RADIO_FILES := true ADD_RADIO_FILES := true
TARGET_RECOVERY_UI_LIB := librecovery_ui_msm

6
init.target.rc
View file

@ -108,6 +108,10 @@ on boot
chown system system /persist/speccfg/submask chown system system /persist/speccfg/submask
chown system system /persist/speccfg/partition chown system system /persist/speccfg/partition
#Load WLAN driver
insmod /system/lib/modules/qca_cld3/qca_cld3_wlan.ko
setprop wlan.driver.status "ok"
#Peripheral manager #Peripheral manager
service per_mgr /system/bin/pm-service service per_mgr /system/bin/pm-service
class core class core
@ -194,7 +198,7 @@ service time_daemon /system/bin/time_daemon
user root user root
group root group root
service adsprpcd /system/bin/adsprpcd service adsprpcd /system/bin/adsprpcd audiopd
class main class main
user media user media
group media group media

75
sdm660_64.mk
View file

@ -1,8 +1,10 @@
TARGET_USES_AOSP := true TARGET_USES_AOSP := true
TARGET_USES_AOSP_FOR_AUDIO := true
TARGET_USES_QCOM_BSP := false TARGET_USES_QCOM_BSP := false
ifeq ($(TARGET_USES_AOSP),true) ifeq ($(TARGET_USES_AOSP),true)
TARGET_ENABLE_QC_AV_ENHANCEMENTS := false TARGET_ENABLE_QC_AV_ENHANCEMENTS := false
TARGET_DISABLE_DASH := true
TARGET_USES_QTIC := false TARGET_USES_QTIC := false
else else
DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay
@ -10,6 +12,17 @@ else
TARGET_USES_QTIC := true TARGET_USES_QTIC := true
endif endif
# Default vendor configuration.
ifeq ($(ENABLE_VENDOR_IMAGE),)
ENABLE_VENDOR_IMAGE := false
endif
# Disable QTIC until it's brought up in split system/vendor
# configuration to avoid compilation breakage.
ifeq ($(ENABLE_VENDOR_IMAGE), true)
TARGET_USES_QTIC := false
endif
TARGET_KERNEL_VERSION := 4.4 TARGET_KERNEL_VERSION := 4.4
BOARD_FRP_PARTITION_NAME := frp BOARD_FRP_PARTITION_NAME := frp
BOARD_HAVE_QCOM_FM := false BOARD_HAVE_QCOM_FM := false
@ -20,6 +33,9 @@ ifeq ($(TARGET_USES_NQ_NFC),true)
NQ3XX_PRESENT := true NQ3XX_PRESENT := true
endif endif
# enable the SVA in UI area
TARGET_USE_UI_SVA := true
#QTIC flag #QTIC flag
-include $(QCPATH)/common/config/qtic-config.mk -include $(QCPATH)/common/config/qtic-config.mk
@ -34,6 +50,15 @@ PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:system/vendor/et
device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \ device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \
device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml
ifneq ($(TARGET_DISABLE_DASH), true)
PRODUCT_BOOT_JARS += qcmediaplayer
endif
# Power
PRODUCT_PACKAGES += \
android.hardware.power@1.0-service \
android.hardware.power@1.0-impl
$(call inherit-product, device/qcom/common/common64.mk) $(call inherit-product, device/qcom/common/common64.mk)
PRODUCT_NAME := sdm660_64 PRODUCT_NAME := sdm660_64
@ -82,6 +107,8 @@ PRODUCT_COPY_FILES += \
# Audio configuration file # Audio configuration file
-include $(TOPDIR)hardware/qcom/audio/configs/sdm660/sdm660.mk -include $(TOPDIR)hardware/qcom/audio/configs/sdm660/sdm660.mk
PRODUCT_PACKAGES += android.hardware.media.omx@1.0-impl
# Sensor HAL conf file # Sensor HAL conf file
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/sensors/hals.conf:system/etc/sensors/hals.conf device/qcom/sdm660_64/sensors/hals.conf:system/etc/sensors/hals.conf
@ -107,16 +134,25 @@ PRODUCT_PACKAGES += \
antradio_app \ antradio_app \
libvolumelistener libvolumelistener
# Gralloc #Display/Graphics
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-impl \
android.hardware.graphics.allocator@2.0-service \ android.hardware.graphics.allocator@2.0-service \
android.hardware.graphics.mapper@2.0-impl android.hardware.graphics.mapper@2.0-impl \
# HW Composer
PRODUCT_PACKAGES += \
android.hardware.graphics.composer@2.1-impl \ android.hardware.graphics.composer@2.1-impl \
android.hardware.graphics.composer@2.1-service android.hardware.graphics.composer@2.1-service \
android.hardware.memtrack@1.0-impl \
android.hardware.memtrack@1.0-service \
android.hardware.light@2.0-impl \
android.hardware.light@2.0-service \
android.hardware.configstore@1.0-service
# Camera configuration file. Shared by passthrough/binderized camera HAL
PRODUCT_PACKAGES += camera.device@3.2-impl
PRODUCT_PACKAGES += camera.device@1.0-impl
PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-impl
# Enable binderized camera HAL
PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-service
# Sensor features # Sensor features
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -132,6 +168,10 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:system/etc/permissions/android.hardware.sensor.relative_humidity.xml \ frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:system/etc/permissions/android.hardware.sensor.relative_humidity.xml \
frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:system/etc/permissions/android.hardware.sensor.hifi_sensors.xml frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:system/etc/permissions/android.hardware.sensor.hifi_sensors.xml
# High performance VR feature
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.vr.high_performance.xml:system/etc/permissions/android.hardware.vr.high_performance.xml
# FBE support # FBE support
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/init.qti.qseecomd.sh:system/bin/init.qti.qseecomd.sh device/qcom/sdm660_64/init.qti.qseecomd.sh:system/bin/init.qti.qseecomd.sh
@ -142,6 +182,9 @@ PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:system/vendor/et
# dm-verity configuration # dm-verity configuration
PRODUCT_SUPPORTS_VERITY := true PRODUCT_SUPPORTS_VERITY := true
PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system
ifeq ($(ENABLE_VENDOR_IMAGE), true)
PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor
endif
#for android_filesystem_config.h #for android_filesystem_config.h
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -166,15 +209,33 @@ else
ro.logdumpd.enabled=0 ro.logdumpd.enabled=0
endif endif
#for wlan
PRODUCT_PACKAGES += \
wificond \
wifilogd
#A/B related packages #A/B related packages
PRODUCT_PACKAGES += update_engine \ PRODUCT_PACKAGES += update_engine \
update_engine_client \ update_engine_client \
update_verifier \ update_verifier \
bootctrl.sdm660 \ bootctrl.sdm660 \
brillo_update_payload brillo_update_payload \
android.hardware.boot@1.0-impl \
android.hardware.boot@1.0-service
#Boot control HAL test app #Boot control HAL test app
PRODUCT_PACKAGES_DEBUG += bootctl PRODUCT_PACKAGES_DEBUG += bootctl
#Healthd packages
PRODUCT_PACKAGES += android.hardware.health@1.0-impl \
android.hardware.health@1.0-convert \
android.hardware.health@1.0-service \
libhealthd.msm
#FEATURE_OPENGLES_EXTENSION_PACK support string config file #FEATURE_OPENGLES_EXTENSION_PACK support string config file
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.opengles.aep.xml:system/etc/permissions/android.hardware.opengles.aep.xml frameworks/native/data/etc/android.hardware.opengles.aep.xml:system/etc/permissions/android.hardware.opengles.aep.xml
#Enable keymaster Impl HAL Compilation
PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl

131
vintf.xml
View file

@ -26,23 +26,144 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--> -->
<manifest version="1.0"> <manifest version="1.0">
<!-- /graphics hal -->
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.graphics.allocator</name> <name>android.hardware.audio</name>
<transport>toggled</transport> <transport arch="32+64">passthrough</transport>
<impl level="generic"></impl> <impl level="generic"></impl>
<version>2.0</version> <version>2.0</version>
</hal> </hal>
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport arch="32+64">passthrough</transport>
<impl level="generic"></impl>
<version>2.0</version>
</hal>
<hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport arch="32+64">passthrough</transport>
<impl level="generic"></impl>
<version>2.0</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>sound_trigger.primary</instance>
</interface>
</hal>
<!-- video omx hal -->
<hal format="hidl">
<name>android.hardware.media</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal>
<hal format="hidl">
<name>android.hardware.media.omx</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal>
<!-- /video omx hal -->
<!-- display -->
<hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>2.0</version>
<interface>
<name>IAllocator</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.graphics.mapper</name> <name>android.hardware.graphics.mapper</name>
<transport>passthrough</transport> <transport arch="32+64">passthrough</transport>
<impl level="generic"></impl> <impl level="generic"></impl>
<version>2.0</version> <version>2.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal> </hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.graphics.composer</name> <name>android.hardware.graphics.composer</name>
<transport>toggled</transport> <transport>hwbinder</transport>
<impl level="generic"></impl> <impl level="generic"></impl>
<version>2.1</version> <version>2.1</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.configstore</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
<interface>
<name>ISurfaceFlingerConfigs</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.light</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>2.0</version>
<interface>
<name>ILight</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.memtrack</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
<interface>
<name>IMemtrack</name>
<instance>default</instance>
</interface>
</hal>
<!-- /display -->
<hal format="hidl">
<name>android.hardware.sensors</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal>
<hal format="hidl">
<name>android.hardware.camera.provider</name>
<transport arch="32+64">toggled</transport>
<impl level="generic"></impl>
<version>2.4</version>
<interface>
<name>ICameraProvider</name>
<instance>legacy/0</instance>
</interface>
</hal>
<!-- bluetooth -->
<hal format="hidl">
<name>android.hardware.bluetooth</name>
<transport arch="32+64">toggled</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal>
<!-- bluetooth -->
<hal format="hidl">
<name>android.hardware.power</name>
<transport arch="32+64">passthrough</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal>
<hal format="hidl">
<name>android.hardware.boot</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal>
<hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>
<impl level="generic"></impl>
<version>1.0</version>
</hal> </hal>
</manifest> </manifest>