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

Merge commit 'f616b465fccfa67423fc1128175764f004f31ea2' into remote

Browse source 
Conflicts:
	sdm660_64.mk

Change-Id: I75b7c9f829abf82f1a32dda7b905eb9986f933cf
This commit is contained in:
Vara Prasad A V S G 2017-05-23 20:36:07 +05:30
commit fe8f23974a
8 changed files with 65 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AndroidBoard.mk
View file

@ -67,6 +67,9 @@ LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
ifeq ($(ENABLE_VENDOR_IMAGE), true)
LOCAL_POST_INSTALL_CMD := echo $(VENDOR_FSTAB_ENTRY) >> $(TARGET_ROOT_OUT)/$(LOCAL_MODULE)
endif
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true) ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true)

2
BoardConfig.mk
View file

@ -70,7 +70,7 @@ 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) ifeq ($(ENABLE_VENDOR_IMAGE), true)
BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824 BOARD_VENDORIMAGE_PARTITION_SIZE := 838860800
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_COPY_OUT_VENDOR := vendor TARGET_COPY_OUT_VENDOR := vendor
VENDOR_FSTAB_ENTRY := "/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,verify" VENDOR_FSTAB_ENTRY := "/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,verify"

1
android_filesystem_config.h
View file

@ -35,6 +35,7 @@ static const struct fs_path_config android_device_files[] = {
{ 00755, AID_BLUETOOTH, AID_BLUETOOTH, (1ULL << CAP_BLOCK_SUSPEND), "system/bin/wcnss_filter" }, { 00755, AID_BLUETOOTH, AID_BLUETOOTH, (1ULL << CAP_BLOCK_SUSPEND), "system/bin/wcnss_filter" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service" }, { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/vendor/bin/pm-service" }, { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/vendor/bin/pm-service" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" },
{ 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" }, { 00755, AID_SYSTEM, AID_SYSTEM, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" },
{ 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" }, { 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" },
#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS #ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS

1
fstab.qcom
View file

@ -13,3 +13,4 @@
/dev/block/bootdevice/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect /dev/block/bootdevice/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
/dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect /dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto /devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect

20
init.target.rc
View file

@ -28,7 +28,6 @@
# #
on early-init on early-init
symlink /data/tombstones /tombstones
on init on init
write /dev/stune/foreground/schedtune.sched_boost_no_override 1 write /dev/stune/foreground/schedtune.sched_boost_no_override 1
@ -54,9 +53,6 @@ on fs
mkdir /persist/bms 0700 root system mkdir /persist/bms 0700 root system
restorecon_recursive /persist restorecon_recursive /persist
mount ext4 /dev/block/bootdevice/by-name/dsp /dsp ro nosuid nodev barrier=1
mount ext4 /dev/block/bootdevice/by-name/dsp_a /dsp ro nosuid nodev barrier=1
on post-fs on post-fs
start qseecomd start qseecomd
exec - root root root -- /system/bin/init.qti.qseecomd.sh exec - root root root -- /system/bin/init.qti.qseecomd.sh
@ -66,11 +62,10 @@ on init
write /sys/module/qpnp_rtc/parameters/poweron_alarm 1 write /sys/module/qpnp_rtc/parameters/poweron_alarm 1
on post-fs-data on post-fs-data
mkdir /data/tombstones 0771 system system mkdir /data/tombstones/modem 0771 system system
mkdir /tombstones/modem 0771 system system mkdir /data/tombstones/lpass 0771 system system
mkdir /tombstones/lpass 0771 system system mkdir /data/tombstones/wcnss 0771 system system
mkdir /tombstones/wcnss 0771 system system mkdir /data/tombstones/dsps 0771 system system
mkdir /tombstones/dsps 0771 system system
mkdir /data/misc/hbtp 0750 system system mkdir /data/misc/hbtp 0750 system system
mkdir /data/misc/seemp 0700 system system mkdir /data/misc/seemp 0700 system system
mkdir /data/misc/tloc 0700 system drmrpc mkdir /data/misc/tloc 0700 system drmrpc
@ -88,8 +83,6 @@ on boot
write /dev/cpuset/top-app/cpus 0-7 write /dev/cpuset/top-app/cpus 0-7
write /dev/cpuset/foreground/cpus 0-7 write /dev/cpuset/foreground/cpus 0-7
write /dev/cpuset/foreground/boost/cpus 0-7 write /dev/cpuset/foreground/boost/cpus 0-7
write /dev/cpuset/background/cpus 0
write /dev/cpuset/system-background/cpus 0-2
####Regionalization config and prop files#### ####Regionalization config and prop files####
chmod 0644 /persist/speccfg/spec chmod 0644 /persist/speccfg/spec
chmod 0644 /persist/speccfg/devicetype chmod 0644 /persist/speccfg/devicetype
@ -113,13 +106,13 @@ on boot
setprop wlan.driver.status "ok" setprop wlan.driver.status "ok"
#Peripheral manager #Peripheral manager
service per_mgr /system/bin/pm-service service per_mgr /system/vendor/bin/pm-service
class core class core
user system user system
group system group system
ioprio rt 4 ioprio rt 4
service per_proxy /system/bin/pm-proxy service per_proxy /system/vendor/bin/pm-proxy
class core class core
user system user system
group system group system
@ -183,6 +176,7 @@ service thermal-engine /system/vendor/bin/thermal-engine
socket thermal-send-client stream 0666 system system socket thermal-send-client stream 0666 system system
socket thermal-recv-client stream 0660 system system socket thermal-recv-client stream 0660 system system
socket thermal-recv-passive-client stream 0666 system system socket thermal-recv-passive-client stream 0666 system system
socket thermal-send-rule stream 0660 system system
group root group root
#service security-check1 /sbin/security_boot_check system #service security-check1 /sbin/security_boot_check system

38
recovery_vendor_variant.fstab Executable file
View file

@ -0,0 +1,38 @@
# Copyright (c) 2017, The Linux Foundation. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials provided
# with the distribution.
# * Neither the name of The Linux Foundation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Vendor variant of recovery.fstab. Same as recovery.fstab, with additional vendor entry.
#device mount point fstype [device2] [length=]
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1 wait,slotselect,verify
/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,slotselect,verify
/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc wait,check,encryptable=footer
/dev/block/mmcblk1p1 /sdcard vfat nosuid,nodev wait
/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults
/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults

20
sdm660_64.mk
View file

@ -7,13 +7,13 @@ endif
# Default vendor configuration. # Default vendor configuration.
ifeq ($(ENABLE_VENDOR_IMAGE),) ifeq ($(ENABLE_VENDOR_IMAGE),)
ENABLE_VENDOR_IMAGE := false ENABLE_VENDOR_IMAGE := true
endif endif
# Disable QTIC until it's brought up in split system/vendor # Disable QTIC until it's brought up in split system/vendor
# configuration to avoid compilation breakage. # configuration to avoid compilation breakage.
ifeq ($(ENABLE_VENDOR_IMAGE), true) ifeq ($(ENABLE_VENDOR_IMAGE), true)
TARGET_USES_QTIC := false #TARGET_USES_QTIC := false
endif endif
TARGET_USES_AOSP_FOR_AUDIO := false TARGET_USES_AOSP_FOR_AUDIO := false
@ -38,9 +38,11 @@ TARGET_USE_UI_SVA := true
# Video codec configuration files # Video codec configuration files
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true)
PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/media_codecs.xml:system/etc/media_codecs.xml \ device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \
device/qcom/sdm660_64/media_codecs_performance.xml:system/etc/media_codecs_performance.xml device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
device/qcom/sdm660_64/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
device/qcom/sdm660_64/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS
# video seccomp policy files # video seccomp policy files
@ -48,9 +50,9 @@ PRODUCT_COPY_FILES += \
device/qcom/sdm660_64/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ device/qcom/sdm660_64/seccomp/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
device/qcom/sdm660_64/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy device/qcom/sdm660_64/seccomp/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy
PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:system/vendor/etc/whitelistedapps.xml \ PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/whitelistedapps.xml \
device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \ device/qcom/sdm660_64/gamedwhitelist.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gamedwhitelist.xml \
device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml device/qcom/sdm660_64/appboosts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/appboosts.xml
ifneq ($(TARGET_DISABLE_DASH), true) ifneq ($(TARGET_DISABLE_DASH), true)
PRODUCT_BOOT_JARS += qcmediaplayer PRODUCT_BOOT_JARS += qcmediaplayer
@ -179,7 +181,7 @@ 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
# MSM IRQ Balancer configuration file # MSM IRQ Balancer configuration file
PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf PRODUCT_COPY_FILES += device/qcom/sdm660_64/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf
# dm-verity configuration # dm-verity configuration
PRODUCT_SUPPORTS_VERITY := true PRODUCT_SUPPORTS_VERITY := true

3
system.prop
View file

@ -182,5 +182,8 @@ camera.lowpower.record.enable=1
#Expose aux camera for below packages #Expose aux camera for below packages
camera.aux.packagelist=org.codeaurora.snapcam camera.aux.packagelist=org.codeaurora.snapcam
#disable UBWC for camera
persist.camera.preview.ubwc=0
# Create zram disk # Create zram disk
ro.config.zram=true ro.config.zram=true