From 98dcfa60c5c8583db7ca11c337d9ce1b4c817030 Mon Sep 17 00:00:00 2001 From: Anubhav Phukan Date: Tue, 18 Apr 2017 17:40:35 +0530 Subject: [PATCH 01/15] sdm660_64: Install video seccomp policy files Change-Id: Iba21a7ce01c98fe3107d271011e6b8b29d181260 --- sdm660_64.mk | 5 +++++ seccomp/mediacodec-seccomp.policy | 12 ++++++++++++ seccomp/mediaextractor-seccomp.policy | 4 ++++ 3 files changed, 21 insertions(+) mode change 100755 => 100644 sdm660_64.mk create mode 100644 seccomp/mediacodec-seccomp.policy create mode 100644 seccomp/mediaextractor-seccomp.policy diff --git a/sdm660_64.mk b/sdm660_64.mk old mode 100755 new mode 100644 index ddca3a72..966a830d --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -46,6 +46,11 @@ PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:system/etc/media_ device/qcom/sdm660_64/media_codecs_performance.xml:system/etc/media_codecs_performance.xml endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS +# video seccomp policy files +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/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 \ device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \ device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml diff --git a/seccomp/mediacodec-seccomp.policy b/seccomp/mediacodec-seccomp.policy new file mode 100644 index 00000000..81d042b0 --- /dev/null +++ b/seccomp/mediacodec-seccomp.policy @@ -0,0 +1,12 @@ +# device specific syscalls +# extension of services/mediacodec/minijail/seccomp_policy/mediacodec-seccomp-arm.policy +pselect6: 1 +eventfd2: 1 +sendto: 1 +recvfrom: 1 +_llseek: 1 +sysinfo: 1 +getcwd: 1 +getdents64: 1 +inotify_init1: 1 +inotify_add_watch: 1 diff --git a/seccomp/mediaextractor-seccomp.policy b/seccomp/mediaextractor-seccomp.policy new file mode 100644 index 00000000..77c1e2ab --- /dev/null +++ b/seccomp/mediaextractor-seccomp.policy @@ -0,0 +1,4 @@ +# device specific syscalls. +# extension of services/mediaextractor/minijail/seccomp_policy/mediaextractor-seccomp-arm.policy +readlinkat: 1 +pread64: 1 From cfd94aa0d0844d58fed748c77893fd966d4855c4 Mon Sep 17 00:00:00 2001 From: Sandeep Kunta Date: Fri, 21 Apr 2017 16:35:25 +0530 Subject: [PATCH 02/15] Add telephony-ext to boot jar path enable telephony-ext jar library in boot jar path. Change-Id: If46e4779cfa4a82df3c836e1622d5c40d0b77a2c --- sdm660_64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index ddca3a72..1ca57541 100755 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -86,7 +86,7 @@ WLAN_CHIPSET := qca_cld3 #Android EGL implementation PRODUCT_PACKAGES += libGLES_android #PRODUCT_BOOT_JARS += tcmiface -#PRODUCT_BOOT_JARS += telephony-ext +PRODUCT_BOOT_JARS += telephony-ext PRODUCT_PACKAGES += telephony-ext From 689cd651cc2e750730d41c2eead1a2991dc06520 Mon Sep 17 00:00:00 2001 From: Anubhav Phukan Date: Fri, 21 Apr 2017 18:16:28 +0530 Subject: [PATCH 03/15] sdm660_64: Enable avenhancements for sdm660 Change-Id: I509a3878e8ec75dd845a435e7348c1382a19ddcc --- sdm660_64.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) mode change 100755 => 100644 sdm660_64.mk diff --git a/sdm660_64.mk b/sdm660_64.mk old mode 100755 new mode 100644 index ddca3a72..d87059fa --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -1,15 +1,8 @@ TARGET_USES_AOSP := true -TARGET_USES_AOSP_FOR_AUDIO := true TARGET_USES_QCOM_BSP := false -ifeq ($(TARGET_USES_AOSP),true) - TARGET_ENABLE_QC_AV_ENHANCEMENTS := false - TARGET_DISABLE_DASH := true - TARGET_USES_QTIC := false -else +ifneq ($(TARGET_USES_AOSP),true) DEVICE_PACKAGE_OVERLAYS := device/qcom/sdm660_64/overlay - TARGET_ENABLE_QC_AV_ENHANCEMENTS := true - TARGET_USES_QTIC := true endif # Default vendor configuration. @@ -23,6 +16,10 @@ ifeq ($(ENABLE_VENDOR_IMAGE), true) TARGET_USES_QTIC := false endif +TARGET_USES_AOSP_FOR_AUDIO := false +TARGET_ENABLE_QC_AV_ENHANCEMENTS := true +TARGET_DISABLE_DASH := true + TARGET_KERNEL_VERSION := 4.4 BOARD_FRP_PARTITION_NAME := frp BOARD_HAVE_QCOM_FM := false From ecafc60a4ea4212fa4edb161651c53d3e8155d4e Mon Sep 17 00:00:00 2001 From: Ameya Thakur Date: Tue, 25 Apr 2017 15:03:27 -0700 Subject: [PATCH 04/15] sdm660_64: Update per_mgr path Peripheral manager now sits in the vendor directory/partition. Update the init script to reflect the same. Change-Id: Icc26f8b6269849b9d6c8a5a81b9cf1dddfc70fbf --- android_filesystem_config.h | 1 + init.target.rc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android_filesystem_config.h b/android_filesystem_config.h index 7251a08c..0785d55d 100755 --- a/android_filesystem_config.h +++ b/android_filesystem_config.h @@ -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_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), "vendor/bin/pm-service" }, { 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" }, #ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS diff --git a/init.target.rc b/init.target.rc index fd780bde..77367d2a 100755 --- a/init.target.rc +++ b/init.target.rc @@ -113,13 +113,13 @@ on boot setprop wlan.driver.status "ok" #Peripheral manager -service per_mgr /system/bin/pm-service +service per_mgr /system/vendor/bin/pm-service class core user system group system ioprio rt 4 -service per_proxy /system/bin/pm-proxy +service per_proxy /system/vendor/bin/pm-proxy class core user system group system From 7c968c11d57656456115b3d93b547429ee8e5c25 Mon Sep 17 00:00:00 2001 From: padarshr Date: Mon, 1 May 2017 14:41:23 +0530 Subject: [PATCH 05/15] sdm660_64: Move the dsp partition into A/B mode. We now move the mounting of the dsp partition into the fstab so that fs_mgr can use the slotselect argument to correctly mount the partition based on the current active slot. Change-Id: I9548185be984842a6edd7c44731d66bda6e0016d --- fstab.qcom | 1 + init.target.rc | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fstab.qcom b/fstab.qcom index a60b0bb8..6a6b1062 100755 --- a/fstab.qcom +++ b/fstab.qcom @@ -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/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 +/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect diff --git a/init.target.rc b/init.target.rc index fd780bde..df7bbcc8 100755 --- a/init.target.rc +++ b/init.target.rc @@ -54,9 +54,6 @@ on fs mkdir /persist/bms 0700 root system 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 start qseecomd exec - root root root -- /system/bin/init.qti.qseecomd.sh From 57cb502bd8b7b49095b85011f78aca8bacfabb65 Mon Sep 17 00:00:00 2001 From: Mahesh Lanka Date: Tue, 2 May 2017 13:53:29 +0530 Subject: [PATCH 06/15] SDM660_64: Install media config files in vendor/etc Also install in system/etc and system/vendor/etc till the migration to /vendor is complete Change-Id: I9a548bc09900e0eee96d644faf851e2bb27fcbf2 --- sdm660_64.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) mode change 100755 => 100644 sdm660_64.mk diff --git a/sdm660_64.mk b/sdm660_64.mk old mode 100755 new mode 100644 index ddca3a72..54084e56 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -40,10 +40,21 @@ TARGET_USE_UI_SVA := true -include $(QCPATH)/common/config/qtic-config.mk # Video codec configuration files +MEDIA_XML_TARGET := system/vendor/etc +MEDIA_XML_TARGET_VENDOR := vendor/etc +MEDIA_XML_TARGET_SYSTEM := etc ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \ - device/qcom/sdm660_64/media_codecs.xml:system/etc/media_codecs.xml \ - device/qcom/sdm660_64/media_codecs_performance.xml:system/etc/media_codecs_performance.xml +PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET)/media_profiles.xml \ + device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET_VENDOR)/media_profiles.xml \ + device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_profiles.xml + +PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET)/media_codecs.xml \ + device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET_VENDOR)/media_codecs.xml \ + device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_codecs.xml + +PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET)/media_codecs_performance.xml \ + device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET_VENDOR)/media_codecs_performance.xml \ + device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_codecs_performance.xml endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:system/vendor/etc/whitelistedapps.xml \ From 91e7368b62ab2feee5712c9b558245d41211e889 Mon Sep 17 00:00:00 2001 From: Krupal Divvela Date: Wed, 19 Apr 2017 17:00:06 +0530 Subject: [PATCH 07/15] system prop: Disable camera UBWC Disable camera (CPP) UBWC for time being till the CPP page fault issue is fixed. Change-Id: I56f5e4b731580b47e0b82ff2edaa3803ac816b32 CRs-Fixed: 2024750 --- system.prop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system.prop b/system.prop index 56b48514..993b86a0 100755 --- a/system.prop +++ b/system.prop @@ -182,5 +182,8 @@ camera.lowpower.record.enable=1 #Expose aux camera for below packages camera.aux.packagelist=org.codeaurora.snapcam +#disable UBWC for camera +persist.camera.preview.ubwc=0 + # Create zram disk ro.config.zram=true From 584d261bf76684c6cc4fb88cb25c6591ef0f85c9 Mon Sep 17 00:00:00 2001 From: David Ng Date: Wed, 1 Feb 2017 16:27:44 -0800 Subject: [PATCH 08/15] Remove rootfs runtime changes during init for tombstones With A/B update, rootfs is supported by system fs and thus always read-only. Remove unnecessary /tombstones symlink and change all subdirectory creation under /tombstones to be /data/tombstones. Change-Id: Ibb991f80fc09e0397c37cecea07f531f49802773 --- init.target.rc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/init.target.rc b/init.target.rc index df7bbcc8..ed00bd41 100755 --- a/init.target.rc +++ b/init.target.rc @@ -28,7 +28,6 @@ # on early-init - symlink /data/tombstones /tombstones on init write /dev/stune/foreground/schedtune.sched_boost_no_override 1 @@ -63,11 +62,10 @@ on init write /sys/module/qpnp_rtc/parameters/poweron_alarm 1 on post-fs-data - mkdir /data/tombstones 0771 system system - mkdir /tombstones/modem 0771 system system - mkdir /tombstones/lpass 0771 system system - mkdir /tombstones/wcnss 0771 system system - mkdir /tombstones/dsps 0771 system system + mkdir /data/tombstones/modem 0771 system system + mkdir /data/tombstones/lpass 0771 system system + mkdir /data/tombstones/wcnss 0771 system system + mkdir /data/tombstones/dsps 0771 system system mkdir /data/misc/hbtp 0750 system system mkdir /data/misc/seemp 0700 system system mkdir /data/misc/tloc 0700 system drmrpc From c4412004c5e16bbc2df484b1b76f37f80ab2b8ff Mon Sep 17 00:00:00 2001 From: Pawan Chilka Date: Fri, 5 May 2017 20:36:01 +0530 Subject: [PATCH 09/15] SDM660_64 adding recovery_vendor_variant.fstab Change-Id: I8244447366000be328b77844365658470de85611 --- recovery_vendor_variant.fstab | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 recovery_vendor_variant.fstab diff --git a/recovery_vendor_variant.fstab b/recovery_vendor_variant.fstab new file mode 100755 index 00000000..2e9d39d7 --- /dev/null +++ b/recovery_vendor_variant.fstab @@ -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 From 63254e96821f75f6b87f9afc90614be9627fd7ac Mon Sep 17 00:00:00 2001 From: Pawan Chilka Date: Fri, 5 May 2017 20:13:17 +0530 Subject: [PATCH 10/15] Install default configuration files in system/vendor/etc/ for 64 bit Change-Id: Ie12caf5fe70550f237eb67b292ad15b9c59b7a42 --- sdm660_64.mk | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index 8cde1340..f011a11c 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -37,21 +37,10 @@ TARGET_USE_UI_SVA := true -include $(QCPATH)/common/config/qtic-config.mk # Video codec configuration files -MEDIA_XML_TARGET := system/vendor/etc -MEDIA_XML_TARGET_VENDOR := vendor/etc -MEDIA_XML_TARGET_SYSTEM := etc ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET)/media_profiles.xml \ - device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET_VENDOR)/media_profiles.xml \ - device/qcom/sdm660_64/media_profiles.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_profiles.xml - -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET)/media_codecs.xml \ - device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET_VENDOR)/media_codecs.xml \ - device/qcom/sdm660_64/media_codecs.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_codecs.xml - -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET)/media_codecs_performance.xml \ - device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET_VENDOR)/media_codecs_performance.xml \ - device/qcom/sdm660_64/media_codecs_performance.xml:$(MEDIA_XML_TARGET_SYSTEM)/media_codecs_performance.xml +PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml +PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml +PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS # video seccomp policy files @@ -59,9 +48,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/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 \ - device/qcom/sdm660_64/gamedwhitelist.xml:system/vendor/etc/gamedwhitelist.xml \ - device/qcom/sdm660_64/appboosts.xml:system/vendor/etc/appboosts.xml +PRODUCT_COPY_FILES += device/qcom/sdm660_64/whitelistedapps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/whitelistedapps.xml \ + device/qcom/sdm660_64/gamedwhitelist.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gamedwhitelist.xml \ + device/qcom/sdm660_64/appboosts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/appboosts.xml ifneq ($(TARGET_DISABLE_DASH), true) PRODUCT_BOOT_JARS += qcmediaplayer @@ -190,7 +179,7 @@ PRODUCT_COPY_FILES += \ device/qcom/sdm660_64/init.qti.qseecomd.sh:system/bin/init.qti.qseecomd.sh # 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 PRODUCT_SUPPORTS_VERITY := true From 9eb12cdecfab845311cb815117ceb74c6c136bd8 Mon Sep 17 00:00:00 2001 From: jinfaw Date: Mon, 8 May 2017 15:45:00 +0800 Subject: [PATCH 11/15] sdm660_64:enable TARGET_USES_QTIC Re-enable qrdplus after vendor partition was enabled Change-Id: I9d1dd79e140d0a728a73d8ead91300ca59a99c4e CRs-Fixed: 2044401 --- sdm660_64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index f011a11c..441c09c7 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -13,7 +13,7 @@ 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 +#TARGET_USES_QTIC := false endif TARGET_USES_AOSP_FOR_AUDIO := false From 506c4e194e01ba287c5be8d337c149a4809647d6 Mon Sep 17 00:00:00 2001 From: Pawan Chilka Date: Wed, 10 May 2017 13:52:09 +0530 Subject: [PATCH 12/15] SDM660_64 BIT :Enabling vendor.img Change-Id: I3cbb4487435e86ab8233ec024f285a9088d8e4e4 --- AndroidBoard.mk | 3 +++ BoardConfig.mk | 2 +- sdm660_64.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 96cfa55f..80783bae 100755 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -67,6 +67,9 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) 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) ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true) diff --git a/BoardConfig.mk b/BoardConfig.mk index 1e880c30..8f356ffb 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -70,7 +70,7 @@ BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64) ifeq ($(ENABLE_VENDOR_IMAGE), true) -BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824 +BOARD_VENDORIMAGE_PARTITION_SIZE := 838860800 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" diff --git a/sdm660_64.mk b/sdm660_64.mk index 441c09c7..2b08e539 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -7,7 +7,7 @@ endif # Default vendor configuration. ifeq ($(ENABLE_VENDOR_IMAGE),) -ENABLE_VENDOR_IMAGE := false +ENABLE_VENDOR_IMAGE := true endif # Disable QTIC until it's brought up in split system/vendor From ec2cfbd7080a2ad136cf99788f8dbe064605164f Mon Sep 17 00:00:00 2001 From: Pavankumar Kondeti Date: Mon, 3 Apr 2017 09:21:13 +0530 Subject: [PATCH 13/15] sdm660_64: update cpuset settings for background and system-background Allow backgroun and system-background group tasks to run on all little cluster CPUs. Currently they are limited to run on CPU0 and CPU0-CPU2 respectively. The new settings showed improvement in application sequential launch latency test results. CRs-Fixed: 2032599 Change-Id: Ia98aff2dc084299f5e1a73418dceff1a0444cd98 --- init.target.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/init.target.rc b/init.target.rc index 4cf23274..252c892c 100755 --- a/init.target.rc +++ b/init.target.rc @@ -83,8 +83,6 @@ on boot write /dev/cpuset/top-app/cpus 0-7 write /dev/cpuset/foreground/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#### chmod 0644 /persist/speccfg/spec chmod 0644 /persist/speccfg/devicetype From acd05df45338a257f0c9a0a39ae1014df4123892 Mon Sep 17 00:00:00 2001 From: Manaf Meethalavalappu Pallikunhi Date: Mon, 20 Mar 2017 21:25:43 +0530 Subject: [PATCH 14/15] sdm660: thermal: Add thermal send rule socket to thermal service init Add thermal send rule socket to thermal service initialization script This change is required for SE Android so that thermal socket context are not overridden by init. Change-Id: I8774b62f35f72a481f9976dda5d1aee1e19d8374 --- init.target.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/init.target.rc b/init.target.rc index 4cf23274..1539f4a1 100755 --- a/init.target.rc +++ b/init.target.rc @@ -178,6 +178,7 @@ service thermal-engine /system/vendor/bin/thermal-engine socket thermal-send-client stream 0666 system system socket thermal-recv-client stream 0660 system system socket thermal-recv-passive-client stream 0666 system system + socket thermal-send-rule stream 0660 system system group root #service security-check1 /sbin/security_boot_check system From ad007c396b706778285f9d527dac3c28ed575fe7 Mon Sep 17 00:00:00 2001 From: Uma Mehta Date: Wed, 17 May 2017 17:13:56 +0530 Subject: [PATCH 15/15] sdm660: Install media_profiles in system/etc Install media_profiles in system/etc as well since the file is currently checked in system etc partition only Change-Id: I5e59623fd367d00bfd7cfdf3ddca07749e76f84a --- sdm660_64.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index 2b08e539..9bfc9161 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -38,9 +38,11 @@ TARGET_USE_UI_SVA := true # Video codec configuration files ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml -PRODUCT_COPY_FILES += device/qcom/sdm660_64/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml +PRODUCT_COPY_FILES += \ + device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.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 # video seccomp policy files