From d3c7b41b32208d8bcb99e6a531e3325963c48db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 28 Aug 2017 22:26:00 +0200 Subject: msm8996-common: sepolicy: add file_contexts policy for tfa9890 --- sepolicy/file_contexts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 43df33d..54c3534 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -40,3 +40,6 @@ # ril /(vendor|system/vendor)/radio/qcril_database/qcril.db u:object_r:nv_data_file:s0 + +# audio amplifier +/dev/tfa9890 u:object_r:audio_device:s0 -- cgit v1.2.3 From 490a506e2b7940a5d388142f79eaa27846cf3bb5 Mon Sep 17 00:00:00 2001 From: Manjunatha Ramachandra Date: Wed, 13 Sep 2017 12:08:47 +0530 Subject: msm8996-common: Set sync wakee policy tunable Prefer waker CPU (with 1 runnable task) instead of an idle CPU in waker cluster. Change-Id: I174d496cf31bbf8706eaf6ad3740883d1c64b20f --- rootdir/etc/init.qcom.power.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rootdir/etc/init.qcom.power.rc b/rootdir/etc/init.qcom.power.rc index b2a660b..8cd5021 100755 --- a/rootdir/etc/init.qcom.power.rc +++ b/rootdir/etc/init.qcom.power.rc @@ -41,6 +41,9 @@ on enable-low-power write /sys/module/lowmemorykiller/parameters/enable_adaptive_lmk 1 write /sys/module/lowmemorykiller/parameters/vmpressure_file_min 81250 + # Set sync wakee policy tunable + write /proc/sys/kernel/sched_prefer_sync_wakee_to_waker 1 + # Configure governor settings for little cluster write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "interactive" write /sys/devices/system/cpu/cpu0/cpufreq/interactive/use_sched_load 1 -- cgit v1.2.3 From 5d4160f0b69cb86f816c497df504fcef8ef276c4 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Fri, 23 Feb 2018 10:21:34 +0000 Subject: msm8996-common: Remove wificond from device makefiles * This package is being built globally Change-Id: I70aaf469acc29ded3cf5bb24ab112a76b36a7835 --- msm8996.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/msm8996.mk b/msm8996.mk index db6a9da..f786a7b 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -291,7 +291,6 @@ PRODUCT_PACKAGES += \ libqsap_sdk \ libQWiFiSoftApCfg \ libwifi-hal-qcom \ - wificond \ wpa_supplicant \ wpa_supplicant.conf -- cgit v1.2.3 From 72b3b7e9649cc49f3849d9c9f5516d739b453f65 Mon Sep 17 00:00:00 2001 From: Rashed Abdel-Tawab Date: Sat, 7 Oct 2017 15:34:00 -0400 Subject: msm8996-common: Generate treble-compatible makefiles Change-Id: I95fb9a2f30067c25a9d2ed3a235907959befcd90 --- setup-makefiles.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 806f5f6..65975ec 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -40,7 +40,7 @@ setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true write_headers "z2_plus z2_row" # The standard common blobs -write_makefiles "$MY_DIR"/proprietary-files.txt +write_makefiles "$MY_DIR"/proprietary-files.txt true # We are done! write_footers @@ -54,7 +54,7 @@ if [ -s "$MY_DIR"/../"$DEVICE"/proprietary-files.txt ]; then write_headers # The standard device blobs - write_makefiles "$MY_DIR"/../"$DEVICE"/proprietary-files.txt + write_makefiles "$MY_DIR"/../"$DEVICE"/proprietary-files.txt true # We are done! write_footers -- cgit v1.2.3 From 8fd6361f5dbf11b3ce624bbe4759f13a83c5f9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 24 Feb 2018 17:37:01 +0100 Subject: msm8996-common: Clean up extract-files.sh --- extract-files.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) mode change 100644 => 100755 extract-files.sh diff --git a/extract-files.sh b/extract-files.sh old mode 100644 new mode 100755 index c5e540e..78747c0 --- a/extract-files.sh +++ b/extract-files.sh @@ -18,12 +18,6 @@ set -e -# Required! -export DEVICE=z2_plus -export VENDOR=zuk - -export DEVICE_BRINGUP_YEAR=2016 - # Load extract_utils and do some sanity checks MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi @@ -42,14 +36,13 @@ CLEAN_VENDOR=true while [ "$1" != "" ]; do case $1 in - -p | --path ) shift - SRC=$1 + -n | --no-cleanup ) CLEAN_VENDOR=false ;; -s | --section ) shift SECTION=$1 CLEAN_VENDOR=false ;; - -n | --no-cleanup ) CLEAN_VENDOR=false + * ) SRC=$1 ;; esac shift @@ -60,7 +53,7 @@ if [ -z "$SRC" ]; then fi # Initialize the helper for common device -setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" true "$CLEAN_VENDOR" +setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true "$CLEAN_VENDOR" extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION" -- cgit v1.2.3 From e0d0f5c87d62c9410aa62bf30df271f85728f7bd Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 23 Jun 2016 14:54:44 +0100 Subject: Enable Factory Reset Protection (FRP) --- system.prop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system.prop b/system.prop index e771f67..4e62e35 100644 --- a/system.prop +++ b/system.prop @@ -147,3 +147,6 @@ persist.data.df.dev_name=rmnet_usb0 # TimeService persist.timed.enable=true + +# FRP +ro.frp.pst=/dev/block/bootdevice/by-name/frp -- cgit v1.2.3 From b6292a6b94042334df39a5c4dcafdc6eebb3238e Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 27 Jun 2016 23:22:08 +0100 Subject: Set FRP device permissions Change-Id: Ica769bf4bc058041ae044c6a71464823a92f073d --- rootdir/etc/fstab.qcom | 3 ++- rootdir/etc/ueventd.qcom.rc | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index f09eee1..3da3e16 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -17,6 +17,7 @@ /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 /dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=222,fmask=333,context=u:object_r:bt_firmware_file:s0 wait /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 +/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 +/dev/block/bootdevice/by-name/frp /frp emmc defaults defaults /devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb* auto auto defaults voldmanaged=usbdisk:auto diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc index 5263e81..bdff059 100644 --- a/rootdir/etc/ueventd.qcom.rc +++ b/rootdir/etc/ueventd.qcom.rc @@ -244,3 +244,7 @@ # TFA9890 FOR SMARTPA /dev/tfa9890 0660 media media + +# Add device block for FRP +/dev/block/platform/soc/7464900.sdhci/by-name/frp 0600 system system +/dev/block/platform/soc/624000.ufshc/by-name/frp 0600 system system -- cgit v1.2.3 From 65a7703125b5778aa73075ecbe0302ec6cb14755 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 11 Feb 2018 23:30:12 +0000 Subject: msm8996-common: Split vendor specific and system props Change-Id: Ib1a490d2d8f23ca832af915b6af783cad6dcdf17 --- BoardConfigCommon.mk | 3 +- system.prop | 152 --------------------------------------------------- vendor.prop | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 153 deletions(-) delete mode 100644 system.prop create mode 100644 vendor.prop diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 21d35ab..e645e1a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -36,7 +36,8 @@ TARGET_BOARD_PLATFORM := msm8996 TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 # Properties -TARGET_SYSTEM_PROP += $(VENDOR_PATH)/system.prop +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop # Architecture TARGET_ARCH := arm64 diff --git a/system.prop b/system.prop deleted file mode 100644 index 4e62e35..0000000 --- a/system.prop +++ /dev/null @@ -1,152 +0,0 @@ -# Audio -af.fast_track_multiplier=1 -vendor.audio_hal.period_size=192 -vendor.audio.dolby.ds2.enabled=false -vendor.audio.dolby.ds2.hardbypass=false -audio.deep_buffer.media=true -vendor.audio.offload.buffer.size.kb=64 -vendor.audio.offload.gapless.enabled=true -vendor.audio.offload.multiaac.enable=true -vendor.audio.offload.multiple.enabled=false -vendor.audio.offload.passthrough=false -vendor.audio.offload.track.enable=true -audio.offload.video=true -vendor.audio.parser.ip.buffer.size=262144 -vendor.audio.safx.pbe.enabled=true -persist.vendor.audio.fluence.voicecall=true -persist.vendor.audio.fluence.voicerec=false -persist.vendor.audio.fluence.speaker=true -ro.vendor.audio.sdk.fluencetype=fluence -ro.vendor.audio.sdk.ssr=false -vendor.audio.tunnel.encode=false -vendor.voice.path.for.pcm.voip=true - -# Bluetooth -bt.max.hfpclient.connections=1 -qcom.bluetooth.soc=rome -ro.bluetooth.emb_wp_mode=true -ro.bluetooth.wipower=true - -# Camera -persist.camera.preview.ubwc=0 -persist.camera.video.ubwc=0 -ro.persist.qcapb=1 -camera.disable_zsl_mode=1 - -# CNE -persist.cne.feature=1 - -# Data modules -persist.data.mode=concurrent -persist.data.netmgrd.qos.enable=true -ro.use_data_netmgrd=true -persist.data.iwlan.enable=true - -# Device was launched with M -ro.product.first_api_level=23 - -# Display (Qualcomm AD) -ro.qualcomm.cabl=2 -ro.qcom.ad=1 -ro.qcom.ad.calib.data=/system/etc/calib.cfg -ro.qcom.ad.sensortype=2 - -# Fingerprint -persist.qfp=false - -# Google -ro.opa.eligible_device=true - -# Graphics -debug.gralloc.enable_fb_ubwc=1 -persist.hwc.enable_vds=1 -ro.opengles.version=196610 -ro.sf.lcd_density=480 -sdm.perf_hint_window=50 - -# GPS -persist.gps.qc_nlp_in_use=1 -persist.loc.nlp_name=com.qualcomm.location -ro.gps.agps_provider=1 - -# Hdmi -vendor.audio.hw.aac.encoder=true - -# Media -vendor.audio.flac.sw.decoder.24bit=true -media.aac_51_output_enabled=true -mm.enable.smoothstreaming=true -vendor.audio.use.sw.alac.decoder=true -vendor.audio.use.sw.ape.decoder=true - -# Miracast -persist.debug.wfd.enable=1 - -# NITZ -persist.rild.nitz_plmn="" -persist.rild.nitz_long_ons_0="" -persist.rild.nitz_long_ons_1="" -persist.rild.nitz_long_ons_2="" -persist.rild.nitz_long_ons_3="" -persist.rild.nitz_short_ons_0="" -persist.rild.nitz_short_ons_1="" -persist.rild.nitz_short_ons_2="" -persist.rild.nitz_short_ons_3="" - -# Perf -ro.am.reschedule_service=true -ro.min_freq_0=307200 -ro.min_freq_4=307200 -ro.sys.fw.bg_apps_limit=60 -ro.vendor.extension_library=libqti-perfd-client.so - -# Radio -DEVICE_PROVISIONED=1 -rild.libpath=/vendor/lib64/libril-qc-qmi-1.so -ril.subscription.types=NV,RUIM -ro.telephony.default_network=22,22 -ro.telephony.default_cdma_sub=0 -ro.telephony.call_ring.multiple=false -persist.data.qmi.adb_logmask=0 -persist.dbg.ims_volte_enable=1 -persist.dbg.volte_avail_ovr=1 -persist.dbg.vt_avail_ovr=1 -persist.net.doxlat=true -persist.vendor.add_power_save=1 -persist.radio.apm_sim_not_pwdn=1 -persist.vendor.radio.custom_ecc=1 -persist.radio.data_ltd_sys_ind=1 -persist.radio.flexmap_type=dds -persist.radio.force_on_dc=true -persist.radio.hw_mbn_update=1 -persist.radio.multisim.config=dsds -persist.radio.primarycard=true -persist.radio.sib16_support=1 -persist.radio.trigger.silence=true -persist.radio.videopause.mode=1 -persist.vendor.radio.add_power_save=1 -persist.vendor.radio.rat_on=combine -persist.vendor.radio.sw_mbn_update=1 -persist.vendor.radio.sw_mbn_volte=1 -persist.vendor.radio.sw_mbn_openmkt=1 -persist.vendor.radio.hw_mbn_update=1 -persist.vendor.radio.ignore_dom_time=10 -persist.vendor.radio.sib16_support=1 -persist.vendor.qti.telephony.vt_cam_interface=1 - -# RmNet Data -persist.rmnet.data.enable=true -persist.data.wda.enable=true -persist.data.df.dl_mode=5 -persist.data.df.ul_mode=5 -persist.data.df.agg.dl_pkt=10 -persist.data.df.agg.dl_size=4096 -persist.data.df.mux_count=8 -persist.data.df.iwlan_mux=9 -persist.data.df.dev_name=rmnet_usb0 - -# TimeService -persist.timed.enable=true - -# FRP -ro.frp.pst=/dev/block/bootdevice/by-name/frp diff --git a/vendor.prop b/vendor.prop new file mode 100644 index 0000000..4e62e35 --- /dev/null +++ b/vendor.prop @@ -0,0 +1,152 @@ +# Audio +af.fast_track_multiplier=1 +vendor.audio_hal.period_size=192 +vendor.audio.dolby.ds2.enabled=false +vendor.audio.dolby.ds2.hardbypass=false +audio.deep_buffer.media=true +vendor.audio.offload.buffer.size.kb=64 +vendor.audio.offload.gapless.enabled=true +vendor.audio.offload.multiaac.enable=true +vendor.audio.offload.multiple.enabled=false +vendor.audio.offload.passthrough=false +vendor.audio.offload.track.enable=true +audio.offload.video=true +vendor.audio.parser.ip.buffer.size=262144 +vendor.audio.safx.pbe.enabled=true +persist.vendor.audio.fluence.voicecall=true +persist.vendor.audio.fluence.voicerec=false +persist.vendor.audio.fluence.speaker=true +ro.vendor.audio.sdk.fluencetype=fluence +ro.vendor.audio.sdk.ssr=false +vendor.audio.tunnel.encode=false +vendor.voice.path.for.pcm.voip=true + +# Bluetooth +bt.max.hfpclient.connections=1 +qcom.bluetooth.soc=rome +ro.bluetooth.emb_wp_mode=true +ro.bluetooth.wipower=true + +# Camera +persist.camera.preview.ubwc=0 +persist.camera.video.ubwc=0 +ro.persist.qcapb=1 +camera.disable_zsl_mode=1 + +# CNE +persist.cne.feature=1 + +# Data modules +persist.data.mode=concurrent +persist.data.netmgrd.qos.enable=true +ro.use_data_netmgrd=true +persist.data.iwlan.enable=true + +# Device was launched with M +ro.product.first_api_level=23 + +# Display (Qualcomm AD) +ro.qualcomm.cabl=2 +ro.qcom.ad=1 +ro.qcom.ad.calib.data=/system/etc/calib.cfg +ro.qcom.ad.sensortype=2 + +# Fingerprint +persist.qfp=false + +# Google +ro.opa.eligible_device=true + +# Graphics +debug.gralloc.enable_fb_ubwc=1 +persist.hwc.enable_vds=1 +ro.opengles.version=196610 +ro.sf.lcd_density=480 +sdm.perf_hint_window=50 + +# GPS +persist.gps.qc_nlp_in_use=1 +persist.loc.nlp_name=com.qualcomm.location +ro.gps.agps_provider=1 + +# Hdmi +vendor.audio.hw.aac.encoder=true + +# Media +vendor.audio.flac.sw.decoder.24bit=true +media.aac_51_output_enabled=true +mm.enable.smoothstreaming=true +vendor.audio.use.sw.alac.decoder=true +vendor.audio.use.sw.ape.decoder=true + +# Miracast +persist.debug.wfd.enable=1 + +# NITZ +persist.rild.nitz_plmn="" +persist.rild.nitz_long_ons_0="" +persist.rild.nitz_long_ons_1="" +persist.rild.nitz_long_ons_2="" +persist.rild.nitz_long_ons_3="" +persist.rild.nitz_short_ons_0="" +persist.rild.nitz_short_ons_1="" +persist.rild.nitz_short_ons_2="" +persist.rild.nitz_short_ons_3="" + +# Perf +ro.am.reschedule_service=true +ro.min_freq_0=307200 +ro.min_freq_4=307200 +ro.sys.fw.bg_apps_limit=60 +ro.vendor.extension_library=libqti-perfd-client.so + +# Radio +DEVICE_PROVISIONED=1 +rild.libpath=/vendor/lib64/libril-qc-qmi-1.so +ril.subscription.types=NV,RUIM +ro.telephony.default_network=22,22 +ro.telephony.default_cdma_sub=0 +ro.telephony.call_ring.multiple=false +persist.data.qmi.adb_logmask=0 +persist.dbg.ims_volte_enable=1 +persist.dbg.volte_avail_ovr=1 +persist.dbg.vt_avail_ovr=1 +persist.net.doxlat=true +persist.vendor.add_power_save=1 +persist.radio.apm_sim_not_pwdn=1 +persist.vendor.radio.custom_ecc=1 +persist.radio.data_ltd_sys_ind=1 +persist.radio.flexmap_type=dds +persist.radio.force_on_dc=true +persist.radio.hw_mbn_update=1 +persist.radio.multisim.config=dsds +persist.radio.primarycard=true +persist.radio.sib16_support=1 +persist.radio.trigger.silence=true +persist.radio.videopause.mode=1 +persist.vendor.radio.add_power_save=1 +persist.vendor.radio.rat_on=combine +persist.vendor.radio.sw_mbn_update=1 +persist.vendor.radio.sw_mbn_volte=1 +persist.vendor.radio.sw_mbn_openmkt=1 +persist.vendor.radio.hw_mbn_update=1 +persist.vendor.radio.ignore_dom_time=10 +persist.vendor.radio.sib16_support=1 +persist.vendor.qti.telephony.vt_cam_interface=1 + +# RmNet Data +persist.rmnet.data.enable=true +persist.data.wda.enable=true +persist.data.df.dl_mode=5 +persist.data.df.ul_mode=5 +persist.data.df.agg.dl_pkt=10 +persist.data.df.agg.dl_size=4096 +persist.data.df.mux_count=8 +persist.data.df.iwlan_mux=9 +persist.data.df.dev_name=rmnet_usb0 + +# TimeService +persist.timed.enable=true + +# FRP +ro.frp.pst=/dev/block/bootdevice/by-name/frp -- cgit v1.2.3 From 89d7a112547f55292e1dd99c61c022ff6669cd0a Mon Sep 17 00:00:00 2001 From: Sauhard Pande Date: Mon, 3 Apr 2017 19:24:59 +0530 Subject: msm8996-common: camera: Vendor Seperation Moving camera hal and mm-interface binaries to /system/vendor/lib Change-Id: Ic639b698a8bf4418d51409342ab8f1187362a99b --- camera/QCamera2/Android.mk | 1 + camera/QCamera2/stack/mm-camera-interface/Android.mk | 1 + camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 1 + camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index f101f75..358b04d 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -116,6 +116,7 @@ LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 169c1cf..a928805 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -56,6 +56,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index 175796b..cba41d8 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -75,6 +75,7 @@ ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 696f04a..4d3d31d 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -32,6 +32,7 @@ LOCAL_MODULE := libmmlib2d_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3 From 2bfb61bf2a3a92d9fccdcc0d8bd65c6a9e8cbe8b Mon Sep 17 00:00:00 2001 From: Suman Mukherjee Date: Thu, 6 Jul 2017 16:01:18 +0530 Subject: msm8996-common: camera: Added LOCAL_VENDOR_MODULE to set output path of the binaries Replaced LOCAL_PROPRIETARY_MODULE with LOCAL_VENDOR_MODULE to set the output vendor path for hal binaries and libraries Change-Id: Ib04d80eabc0e17f3863e956db5f2378e426c0687 --- camera/QCamera2/Android.mk | 2 +- camera/QCamera2/stack/mm-camera-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-jpeg-interface/Android.mk | 2 +- camera/QCamera2/stack/mm-lib2d-interface/Android.mk | 2 +- camera/mm-image-codec/qomx_core/Android.mk | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 358b04d..2487561 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -116,7 +116,7 @@ LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index a928805..22e4509 100644 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -56,7 +56,7 @@ LOCAL_MODULE := libmmcamera_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk index cba41d8..8dd448d 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/Android.mk @@ -75,7 +75,7 @@ ifeq ($(strip $(LIB2D_ROTATION)),true) LOCAL_SHARED_LIBRARIES += libmmlib2d_interface endif LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk index 4d3d31d..e963b69 100644 --- a/camera/QCamera2/stack/mm-lib2d-interface/Android.mk +++ b/camera/QCamera2/stack/mm-lib2d-interface/Android.mk @@ -32,7 +32,7 @@ LOCAL_MODULE := libmmlib2d_interface LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := libdl libcutils liblog libmmcamera_interface LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_VENDOR_MODULE := true LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) include $(BUILD_SHARED_LIBRARY) diff --git a/camera/mm-image-codec/qomx_core/Android.mk b/camera/mm-image-codec/qomx_core/Android.mk index c4edfc4..9f46202 100644 --- a/camera/mm-image-codec/qomx_core/Android.mk +++ b/camera/mm-image-codec/qomx_core/Android.mk @@ -20,6 +20,7 @@ LOCAL_SRC_FILES := qomx_core.c LOCAL_MODULE := libqomx_core LOCAL_PRELINK_MODULE := false +LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := libcutils libdl liblog LOCAL_32_BIT_ONLY := true -- cgit v1.2.3 From 15087283d31e09165caf099cd3e574e31ff640fb Mon Sep 17 00:00:00 2001 From: Abhishek Arpure Date: Fri, 19 May 2017 08:32:12 -0700 Subject: msm8996-common: Move hardware specific .rc files to /vendor/etc/init/hw The reason these files are moved to /vendor/etc/init/hw and not /vendor/etc/init is because 'init' scans the /vendor/etc/init folder for vendor service .rc fragments to import. That would either result in duplicate imports or out-of-order imports of these hardware specific .rc files and that *may* have unintended consequences. In order to preserve the current import order for MTP, we move all hardware specific .rc files to /vendor/etc/init/hw which is not autoscanned by init BUT leave the init.${ro.hardware}.rc (i.e. init.qcom.rc in this case) in root for 'init' to find. Change-Id: I14531da05e2a3a256f734f8de96e1f1969c753f9 --- rootdir/Android.mk | 6 +++--- rootdir/etc/init.qcom.rc | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index bcdc60c..9324fcb 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -16,7 +16,7 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.power.rc LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.rc LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -34,7 +34,7 @@ LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/init.qcom.usb.rc LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init/hw +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index d193e33..e551463 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -26,6 +26,7 @@ # import /vendor/etc/init/hw/init.qcom.power.rc import /vendor/etc/init/hw/init.qcom.usb.rc +import /vendor/etc/init/hw/init.target.rc on early-init mount debugfs debugfs /sys/kernel/debug -- cgit v1.2.3 From 138360c7d1b7e6004daab82a93b1b5b84d8cad10 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 31 Jan 2018 12:47:59 +0100 Subject: msm8996-common: Move fstab to /vendor Change-Id: I2e86c3be08d0d4f19a6cf89a931f4a1e6ac12cdf --- rootdir/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 9324fcb..eb67fd2 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := etc/fstab.qcom -LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) include $(CLEAR_VARS) -- cgit v1.2.3 From f39082c259630939f16ae5a554384a1415535f29 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Wed, 31 Jan 2018 16:17:03 +0000 Subject: msm8996-common: Build a vendor image * Turn the partition /factory into something more useful for us. Change-Id: I32a3088ef7803d3db691b9031dda2dbe55565ba3 --- BoardConfigCommon.mk | 5 ++++- rootdir/etc/fstab.full | 1 + rootdir/etc/fstab.qcom | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e645e1a..63c5917 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -171,7 +171,10 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 BOARD_USERDATAIMAGE_PARTITION_SIZE := 58132761600 -BOARD_FLASH_BLOCK_SIZE := 262144 +BOARD_VENDORIMAGE_PARTITION_SIZE := 390029312 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) +TARGET_COPY_OUT_VENDOR := vendor # QCOM hardware BOARD_USES_QCOM_HARDWARE := true diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full index 4c3d9c6..8f3aa35 100644 --- a/rootdir/etc/fstab.full +++ b/rootdir/etc/fstab.full @@ -9,6 +9,7 @@ /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/system /system ext4 ro,barrier=1 wait +/dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait /dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,length=-16384 /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,length=-16384 /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 3da3e16..d50afd4 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -1,9 +1,10 @@ # Android fstab file. -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK +# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot +# specify 'check', and must come before any filesystems that do specify 'check' -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. +# NOTE: /system and /vendor (/factory mounted as /vendor) partitions are now early-mounted and the fstab entry is specified in device tree: +# /proc/device-tree/firmware/android/fstab/system +# /proc/device-tree/firmware/android/fstab/vendor # /dev/block/bootdevice/by-name/boot /boot emmc defaults defaults -- cgit v1.2.3 From 5d6afff28bd6b64109fc69dc637ce1e249385714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 02:13:53 +0100 Subject: msm8996-common: wcnss_filter: /system/bin -> /vendor/bin. --- rootdir/etc/init.qcom.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index e551463..ecbd951 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -703,7 +703,7 @@ on property:wc_transport.start_hci=true on property:wc_transport.start_hci=false stop start_hci_filter -service start_hci_filter /system/bin/wcnss_filter +service start_hci_filter /vendor/bin/wcnss_filter class late_start user bluetooth group bluetooth diag system wakelock @@ -716,7 +716,7 @@ on property:wc_transport.start_root=true on property:wc_transport.start_root=false stop hci_filter_root -service hci_filter_root /system/bin/wcnss_filter +service hci_filter_root /vendor/bin/wcnss_filter class late_start user bluetooth group bluetooth diag system @@ -728,7 +728,7 @@ on property:wc_transport.start_root=true on property:wc_transport.start_root=false stop hci_filter_root -service hci_filter_root /system/bin/wcnss_filter +service hci_filter_root /vendor/bin/wcnss_filter class late_start user bluetooth group bluetooth diag system -- cgit v1.2.3 From 9c51d07b50544dff993f498fdc2addd26267d94b Mon Sep 17 00:00:00 2001 From: Lida Wang Date: Fri, 24 Mar 2017 18:11:28 -0700 Subject: msm8996-common: camera: HAL1: fix HAL1 callback cookie 1. fix HAL1 memory callback cookie for Treble change 2. remove checking for VANILLA_HAL definition for O upgrade now for initial bring up, until the removal of the TARGET_USE_AOSP flag in devie mkfile. Change-Id: Iedf5a97e9890bc7216a3008373ddef5005836a01 --- camera/QCamera2/HAL/QCamera2HWI.cpp | 18 +++++++++++------- camera/QCamera2/HAL/QCameraMem.cpp | 29 +++++++++++++++-------------- camera/QCamera2/HAL/QCameraMem.h | 9 ++++++--- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index bc97c07..7066805 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -2715,14 +2715,16 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( { if (isNoDisplayMode()) { mem = new QCameraStreamMemory(mGetMemory, + mCallbackCookie, bCachedMem, (bPoolMem) ? &m_memoryPool : NULL, stream_type); } else { cam_dimension_t dim; int minFPS, maxFPS; - QCameraGrallocMemory *grallocMemory = - new QCameraGrallocMemory(mGetMemory); + QCameraGrallocMemory *grallocMemory = NULL; + + grallocMemory = new QCameraGrallocMemory(mGetMemory, mCallbackCookie); mParameters.getStreamDimension(stream_type, dim); /* we are interested only in maxfps here */ @@ -2758,12 +2760,12 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( case CAM_STREAM_TYPE_POSTVIEW: { if (isNoDisplayMode() || isPreviewRestartEnabled()) { - mem = new QCameraStreamMemory(mGetMemory, bCachedMem); + mem = new QCameraStreamMemory(mGetMemory, mCallbackCookie, bCachedMem); } else { cam_dimension_t dim; int minFPS, maxFPS; QCameraGrallocMemory *grallocMemory = - new QCameraGrallocMemory(mGetMemory); + new QCameraGrallocMemory(mGetMemory, mCallbackCookie); mParameters.getStreamDimension(stream_type, dim); /* we are interested only in maxfps here */ @@ -2782,6 +2784,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( case CAM_STREAM_TYPE_RAW: case CAM_STREAM_TYPE_OFFLINE_PROC: mem = new QCameraStreamMemory(mGetMemory, + mCallbackCookie, bCachedMem, (bPoolMem) ? &m_memoryPool : NULL, stream_type); @@ -2823,7 +2826,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( QCameraVideoMemory *videoMemory = NULL; if (mParameters.getVideoBatchSize()) { videoMemory = new QCameraVideoMemory( - mGetMemory, FALSE, QCAMERA_MEM_TYPE_BATCH); + mGetMemory, mCallbackCookie, FALSE, QCAMERA_MEM_TYPE_BATCH); if (videoMemory == NULL) { LOGE("Out of memory for video batching obj"); return NULL; @@ -2842,7 +2845,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( } } else { videoMemory = - new QCameraVideoMemory(mGetMemory, bCachedMem); + new QCameraVideoMemory(mGetMemory, mCallbackCookie, bCachedMem); if (videoMemory == NULL) { LOGE("Out of memory for video obj"); return NULL; @@ -2862,6 +2865,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamBuf( break; case CAM_STREAM_TYPE_CALLBACK: mem = new QCameraStreamMemory(mGetMemory, + mCallbackCookie, bCachedMem, (bPoolMem) ? &m_memoryPool : NULL, stream_type); @@ -3175,7 +3179,7 @@ QCameraMemory *QCamera2HardwareInterface::allocateStreamUserBuf( switch (streamInfo->stream_type) { case CAM_STREAM_TYPE_VIDEO: { QCameraVideoMemory *video_mem = new QCameraVideoMemory( - mGetMemory, FALSE, QCAMERA_MEM_TYPE_BATCH); + mGetMemory, mCallbackCookie, FALSE, QCAMERA_MEM_TYPE_BATCH); if (video_mem == NULL) { LOGE("Out of memory for video obj"); return NULL; diff --git a/camera/QCamera2/HAL/QCameraMem.cpp b/camera/QCamera2/HAL/QCameraMem.cpp index f4c239a..2502cf3 100755 --- a/camera/QCamera2/HAL/QCameraMem.cpp +++ b/camera/QCamera2/HAL/QCameraMem.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-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 @@ -1050,11 +1050,13 @@ int QCameraMetadataStreamMemory::getRegFlags(uint8_t *regFlags) const * RETURN : none *==========================================================================*/ QCameraStreamMemory::QCameraStreamMemory(camera_request_memory memory, + void* cbCookie, bool cached, QCameraMemoryPool *pool, cam_stream_type_t streamType, __unused cam_stream_buf_type bufType) :QCameraMemory(cached, pool, streamType), - mGetMemory(memory) + mGetMemory(memory), + mCallbackCookie(cbCookie) { for (int i = 0; i < MM_CAMERA_MAX_NUM_FRAMES; i ++) mCameraMemory[i] = NULL; @@ -1100,7 +1102,7 @@ int QCameraStreamMemory::allocate(uint8_t count, size_t size, uint32_t isSecure) if (isSecure == SECURE) { mCameraMemory[i] = 0; } else { - mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, this); + mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, mCallbackCookie); } } mBufferCount = count; @@ -1132,7 +1134,7 @@ int QCameraStreamMemory::allocateMore(uint8_t count, size_t size) } for (int i = mBufferCount; i < mBufferCount + count; i++) { - mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, this); + mCameraMemory[i] = mGetMemory(mMemInfo[i].fd, mMemInfo[i].size, 1, mCallbackCookie); } mBufferCount = (uint8_t)(mBufferCount + count); ATRACE_END(); @@ -1280,9 +1282,9 @@ void *QCameraStreamMemory::getPtr(uint32_t index) const * * RETURN : none *==========================================================================*/ -QCameraVideoMemory::QCameraVideoMemory(camera_request_memory memory, +QCameraVideoMemory::QCameraVideoMemory(camera_request_memory memory, void* cbCookie, bool cached, QCameraMemType bufType) - : QCameraStreamMemory(memory, cached) + : QCameraStreamMemory(memory, cbCookie, cached) { memset(mMetadata, 0, sizeof(mMetadata)); memset(mNativeHandle, 0, sizeof(mNativeHandle)); @@ -1385,7 +1387,7 @@ int QCameraVideoMemory::allocateMore(uint8_t count, size_t size) if (!(mBufType & QCAMERA_MEM_TYPE_BATCH)) { for (int i = mBufferCount; i < count + mBufferCount; i ++) { mMetadata[i] = mGetMemory(-1, - sizeof(media_metadata_buffer), 1, this); + sizeof(media_metadata_buffer), 1, mCallbackCookie); if (!mMetadata[i]) { LOGE("allocation of video metadata failed."); for (int j = mBufferCount; j <= i-1; j ++) { @@ -1447,7 +1449,7 @@ int QCameraVideoMemory::allocateMeta(uint8_t buf_cnt, int numFDs, int numInts) for (int i = 0; i < buf_cnt; i++) { mMetadata[i] = mGetMemory(-1, - sizeof(media_metadata_buffer), 1, this); + sizeof(media_metadata_buffer), 1, mCallbackCookie); if (!mMetadata[i]) { LOGE("allocation of video metadata failed."); for (int j = (i - 1); j >= 0; j--) { @@ -1709,11 +1711,9 @@ int QCameraVideoMemory::convCamtoOMXFormat(cam_format_t format) case CAM_FORMAT_YUV_420_NV12_VENUS: omxFormat = OMX_COLOR_FormatYUV420SemiPlanar; break; -#ifndef VANILLA_HAL case CAM_FORMAT_YUV_420_NV12_UBWC: omxFormat = QOMX_COLOR_FORMATYUV420PackedSemiPlanar32mCompressed; break; -#endif default: omxFormat = OMX_COLOR_FormatYUV420SemiPlanar; } @@ -1731,7 +1731,7 @@ int QCameraVideoMemory::convCamtoOMXFormat(cam_format_t format) * * RETURN : none *==========================================================================*/ -QCameraGrallocMemory::QCameraGrallocMemory(camera_request_memory memory) +QCameraGrallocMemory::QCameraGrallocMemory(camera_request_memory memory, void* cbCookie) : QCameraMemory(true), mColorSpace(ITU_R_601_FR) { mMinUndequeuedBuffers = 0; @@ -1739,6 +1739,7 @@ QCameraGrallocMemory::QCameraGrallocMemory(camera_request_memory memory) mWindow = NULL; mWidth = mHeight = mStride = mScanline = mUsage = 0; mFormat = HAL_PIXEL_FORMAT_YCrCb_420_SP; + mCallbackCookie = cbCookie; mGetMemory = memory; for (int i = 0; i < MM_CAMERA_MAX_NUM_FRAMES; i ++) { mBufferHandle[i] = NULL; @@ -1889,7 +1890,7 @@ int QCameraGrallocMemory::displayBuffer(uint32_t index) mGetMemory(mPrivateHandle[dequeuedIdx]->fd, (size_t)mPrivateHandle[dequeuedIdx]->size, 1, - (void *)this); + mCallbackCookie); LOGH("idx = %d, fd = %d, size = %d, offset = %d", dequeuedIdx, mPrivateHandle[dequeuedIdx]->fd, mPrivateHandle[dequeuedIdx]->size, @@ -2010,7 +2011,7 @@ int32_t QCameraGrallocMemory::dequeueBuffer() mGetMemory(mPrivateHandle[dequeuedIdx]->fd, (size_t)mPrivateHandle[dequeuedIdx]->size, 1, - (void *)this); + mCallbackCookie); LOGH("idx = %d, fd = %d, size = %d, offset = %d", dequeuedIdx, mPrivateHandle[dequeuedIdx]->fd, mPrivateHandle[dequeuedIdx]->size, @@ -2201,7 +2202,7 @@ int QCameraGrallocMemory::allocate(uint8_t count, size_t /*size*/, mGetMemory(mPrivateHandle[cnt]->fd, (size_t)mPrivateHandle[cnt]->size, 1, - (void *)this); + mCallbackCookie); LOGH("idx = %d, fd = %d, size = %d, offset = %d", cnt, mPrivateHandle[cnt]->fd, mPrivateHandle[cnt]->size, diff --git a/camera/QCamera2/HAL/QCameraMem.h b/camera/QCamera2/HAL/QCameraMem.h index a20e29a..ec75e51 100644 --- a/camera/QCamera2/HAL/QCameraMem.h +++ b/camera/QCamera2/HAL/QCameraMem.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-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 @@ -192,6 +192,7 @@ public: class QCameraStreamMemory : public QCameraMemory { public: QCameraStreamMemory(camera_request_memory getMemory, + void* cbCookie, bool cached, QCameraMemoryPool *pool = NULL, cam_stream_type_t streamType = CAM_STREAM_TYPE_DEFAULT, @@ -210,13 +211,14 @@ public: protected: camera_request_memory mGetMemory; camera_memory_t *mCameraMemory[MM_CAMERA_MAX_NUM_FRAMES]; + void* mCallbackCookie; }; // Externel heap memory is used for memories shared with // framework. They are allocated from /dev/ion or gralloc. class QCameraVideoMemory : public QCameraStreamMemory { public: - QCameraVideoMemory(camera_request_memory getMemory, bool cached, + QCameraVideoMemory(camera_request_memory getMemory, void* cbCookie, bool cached, QCameraMemType bufType = QCAMERA_MEM_TYPE_DEFAULT); virtual ~QCameraVideoMemory(); @@ -248,7 +250,7 @@ class QCameraGrallocMemory : public QCameraMemory { BUFFER_OWNED, }; public: - QCameraGrallocMemory(camera_request_memory getMemory); + QCameraGrallocMemory(camera_request_memory getMemory, void* cbCookie); void setNativeWindow(preview_stream_ops_t *anw); virtual ~QCameraGrallocMemory(); @@ -282,6 +284,7 @@ private: preview_stream_ops_t *mWindow; int mWidth, mHeight, mFormat, mStride, mScanline, mUsage, mMaxFPS; camera_request_memory mGetMemory; + void* mCallbackCookie; camera_memory_t *mCameraMemory[MM_CAMERA_MAX_NUM_FRAMES]; int mMinUndequeuedBuffers; enum ColorSpace_t mColorSpace; -- cgit v1.2.3 From 09c713ce51870146bd67824de1111e96c1198541 Mon Sep 17 00:00:00 2001 From: Binhao Lin Date: Mon, 3 Apr 2017 14:09:33 -0700 Subject: msm8996-common: camera: HAL3: Return Error For Unsupported Stream Format Return error code -EINVAL instead of 0 when the stream format is unsupported Change-Id: If6aee12c68054243a90d655bbaf0e95c36887682 --- camera/QCamera2/HAL3/QCamera3HWI.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 14d15a5..4e785f6 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -2111,7 +2111,8 @@ int QCamera3HardwareInterface::configureStreamsPerfLocked( default: LOGE("not a supported format 0x%x", newStream->format); - break; + pthread_mutex_unlock(&mMutex); + return -EINVAL; } } else if (newStream->stream_type == CAMERA3_STREAM_INPUT) { newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS; -- cgit v1.2.3 From 973571990a1382062bee4d24ceae6881ba33db85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 16:28:53 +0100 Subject: msm8996-common: proprietary-files.txt: Clean up * Full update to ZUI 3.5.259/3.5.261 * Decommonize tfa9890 since it is only in z2_row. * Decommonize sensor_def_qcomdev.conf and hals.conf --- proprietary-files.txt | 486 ++++++++++++++++++++++---------------------------- 1 file changed, 209 insertions(+), 277 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index e8145e8..376407c 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,107 +1,74 @@ # ADSP vendor/bin/adsprpcd +vendor/lib64/libadsprpc.so +vendor/lib64/libadsp_default_listener.so +vendor/lib64/libfastcvadsp_stub.so +vendor/lib64/libfastcvopt.so vendor/lib/libadsprpc.so vendor/lib/libadsp_default_listener.so vendor/lib/libadsp_hvx_callback_skel.so vendor/lib/libadsp_hvx_stub.so vendor/lib/libfastcvadsp_stub.so vendor/lib/libfastcvopt.so -vendor/lib64/libadsprpc.so -vendor/lib64/libadsp_default_listener.so -vendor/lib64/libfastcvadsp_stub.so -vendor/lib64/libfastcvopt.so # ADSP modules -vendor/lib/rfsa/adsp/libapps_mem_heap.so -vendor/lib/rfsa/adsp/libdspCV_skel.so vendor/lib/rfsa/adsp/libadsp_fd_skel.so vendor/lib/rfsa/adsp/libadsp_hvx_add_constant.so vendor/lib/rfsa/adsp/libadsp_hvx_skel.so vendor/lib/rfsa/adsp/libadsp_hvx_stats.so vendor/lib/rfsa/adsp/libadsp_hvx_zzhdr_BGGR.so vendor/lib/rfsa/adsp/libadsp_hvx_zzhdr_RGGB.so -vendor/lib/rfsa/adsp/libfastcvadsp_skel.so +vendor/lib/rfsa/adsp/libapps_mem_heap.so +vendor/lib/rfsa/adsp/libscveBlobDescriptor_skel.so +vendor/lib/rfsa/adsp/libscveT2T_skel.so +vendor/lib/rfsa/adsp/libdspCV_skel.so +vendor/lib/rfsa/adsp/libexternal_dog_skel.so vendor/lib/rfsa/adsp/libfastcvadsp.so -vendor/lib/rfsa/adsp/libvpp_frc.so +vendor/lib/rfsa/adsp/libfastcvadsp_skel.so +vendor/lib/rfsa/adsp/libhvxMathVIO.so vendor/lib/rfsa/adsp/libvpp_svc_skel.so +vendor/lib/rfsa/adsp/libvpp_frc.so vendor/lib/rfsa/adsp/us-syncproximity.so -vendor/lib/rfsa/adsp/libscveBlobDescriptor_skel.so -vendor/lib/rfsa/adsp/libscveT2T_skel.so - -# Audio ACDB -vendor/etc/acdbdata/Liquid/Liquid_Hdmi_cal.acdb -vendor/etc/acdbdata/Liquid/Liquid_Global_cal.acdb -vendor/etc/acdbdata/Liquid/Liquid_General_cal.acdb -vendor/etc/acdbdata/Liquid/Liquid_Headset_cal.acdb -vendor/etc/acdbdata/Liquid/Liquid_Handset_cal.acdb -vendor/etc/acdbdata/Liquid/Liquid_Bluetooth_cal.acdb -vendor/etc/acdbdata/Liquid/Liquid_Speaker_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_Speaker_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_Bluetooth_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_General_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_Hdmi_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_Handset_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_Headset_cal.acdb -vendor/etc/acdbdata/Fluid/Fluid_Global_cal.acdb -vendor/etc/acdbdata/QRD/QRD_Speaker_cal.acdb -vendor/etc/acdbdata/QRD/QRD_Headset_cal.acdb -vendor/etc/acdbdata/QRD/QRD_General_cal.acdb -vendor/etc/acdbdata/QRD/QRD_Bluetooth_cal.acdb -vendor/etc/acdbdata/QRD/QRD_Hdmi_cal.acdb -vendor/etc/acdbdata/QRD/QRD_Handset_cal.acdb -vendor/etc/acdbdata/QRD/QRD_Global_cal.acdb # Audio libraries -vendor/lib/soundfx/libqcbassboost.so -vendor/lib/soundfx/libqcreverb.so -vendor/lib/soundfx/libqcvirt.so -vendor/lib/libadm.so +etc/permissions/audiosphere.xml +framework/audiosphere.jar vendor/lib/libacdb-fts.so vendor/lib/libacdbloader.so -vendor/lib/libacdbmapper.so vendor/lib/libacdbrtac.so vendor/lib/libadiertac.so +vendor/lib/libadm.so vendor/lib/libaudcal.so vendor/lib/libaudioalsa.so -vendor/lib/libaudiodevarb.so --vendor/lib/libaudio_log_utils.so vendor/lib/libmdsprpc.so -vendor/lib/libqct_resampler.so vendor/lib/libqtigef.so -vendor/lib64/soundfx/libqcbassboost.so -vendor/lib64/soundfx/libqcreverb.so -vendor/lib64/soundfx/libqcvirt.so +vendor/lib/soundfx/libasphere.so +vendor/lib/soundfx/libqcbassboost.so +vendor/lib/soundfx/libqcreverb.so +vendor/lib/soundfx/libqcvirt.so +vendor/lib/soundfx/libshoebox.so vendor/lib64/libacdb-fts.so vendor/lib64/libacdbloader.so -vendor/lib64/libacdbmapper.so vendor/lib64/libacdbrtac.so vendor/lib64/libadiertac.so vendor/lib64/libaudcal.so vendor/lib64/libaudioalsa.so -vendor/lib64/libaudiodevarb.so --vendor/lib64/libaudio_log_utils.so vendor/lib64/libmdsprpc.so vendor/lib64/libqtigef.so +vendor/lib64/soundfx/libasphere.so +vendor/lib64/soundfx/libqcbassboost.so +vendor/lib64/soundfx/libqcreverb.so +vendor/lib64/soundfx/libqcvirt.so +vendor/lib64/soundfx/libshoebox.so # Bluetooth -bin/hci_qcomm_init -bin/wcnss_filter +vendor/bin/wcnss_filter vendor/lib64/libbtnv.so vendor/lib/libbtnv.so # Bluetooth firmware -etc/firmware/btfw32.tlv -etc/firmware/btnv32.bin -etc/firmware/nvm_tlv.bin -etc/firmware/nvm_tlv_1.3.bin -etc/firmware/nvm_tlv_2.1.bin -etc/firmware/nvm_tlv_3.0.bin -etc/firmware/nvm_tlv_3.2.bin -etc/firmware/rampatch_tlv.img -etc/firmware/rampatch_tlv_1.3.tlv -etc/firmware/rampatch_tlv_2.1.tlv -etc/firmware/rampatch_tlv_3.0.tlv -etc/firmware/rampatch_tlv_3.2.tlv +etc/bluetooth/btfw32.tlv +etc/bluetooth/btnv32.bin # Camera lib/libtrueportrait.so @@ -163,32 +130,23 @@ vendor/lib/libqomx_jpegdec.so vendor/lib/libqomx_jpegenc_pipe.so vendor/lib/libqomx_jpegenc.so vendor/lib/libseemore.so -vendor/lib/libtm_interface.so vendor/lib/libtsvideoprocess.so vendor/lib/libubifocus.so -vendor/lib64/libmmcamera_dbg.so -vendor/lib64/libmmcamera_tintless_algo.so -vendor/lib64/libmmcamera_tintless_bg_pca_algo.so -vendor/lib64/libmmcamera2_frame_algorithm.so -vendor/lib64/libmmcamera2_is.so -vendor/lib64/libmmcamera2_memleak.so -vendor/lib64/libmmcamera2_q3a_core.so -vendor/lib64/libmmcamera2_stats_algorithm.so # Camera eeproms vendor/lib/libmmcamera_gt24c08h_eeprom.so # Camera firmware -etc/firmware/cpp_firmware_v1_1_1.fw -etc/firmware/cpp_firmware_v1_1_6.fw -etc/firmware/cpp_firmware_v1_10_0.fw -etc/firmware/cpp_firmware_v1_12_0.fw -etc/firmware/cpp_firmware_v1_2_0.fw -etc/firmware/cpp_firmware_v1_4_0.fw -etc/firmware/cpp_firmware_v1_5_0.fw -etc/firmware/cpp_firmware_v1_5_2.fw -etc/firmware/cpp_firmware_v1_6_0.fw -etc/firmware/cpp_firmware_v1_8_0.fw +etc/firmware/cpp_firmware_v1_1_1.fw:vendor/firmware/cpp_firmware_v1_1_1.fw +etc/firmware/cpp_firmware_v1_1_6.fw:vendor/firmware/cpp_firmware_v1_1_6.fw +etc/firmware/cpp_firmware_v1_10_0.fw:vendor/firmware/cpp_firmware_v1_10_0.fw +etc/firmware/cpp_firmware_v1_12_0.fw:vendor/firmware/cpp_firmware_v1_12_0.fw +etc/firmware/cpp_firmware_v1_2_0.fw:vendor/firmware/cpp_firmware_v1_2_0.fw +etc/firmware/cpp_firmware_v1_4_0.fw:vendor/firmware/cpp_firmware_v1_4_0.fw +etc/firmware/cpp_firmware_v1_5_0.fw:vendor/firmware/cpp_firmware_v1_5_0.fw +etc/firmware/cpp_firmware_v1_5_2.fw:vendor/firmware/cpp_firmware_v1_5_2.fw +etc/firmware/cpp_firmware_v1_6_0.fw:vendor/firmware/cpp_firmware_v1_6_0.fw +etc/firmware/cpp_firmware_v1_8_0.fw:vendor/firmware/cpp_firmware_v1_8_0.fw # Camera ov8865 etc/camera/ov8865_chromatix.xml @@ -218,7 +176,6 @@ vendor/lib/libchromatix_ov8865_snapshot.so vendor/lib/libchromatix_ov8865_video_full.so vendor/lib/libchromatix_ov8865_zsl_preview.so vendor/lib/libchromatix_ov8865_zsl_video.so -vendor/lib/libmmcamera_ov8865.so # Camera sensors vendor/lib/libmmcamera_isp_abf47.so @@ -264,10 +221,21 @@ vendor/lib/libmmcamera_isp_snr47.so vendor/lib/libmmcamera_isp_sub_module.so # CNE +etc/cne/andsfCne.xml +etc/cne/SwimConfig.xml +etc/permissions/cneapiclient.xml +etc/permissions/com.quicinc.cne.xml +framework/cneapiclient.jar framework/com.quicinc.cne.api-V1.0-java.jar framework/com.quicinc.cne.jar -etc/permissions/com.quicinc.cne.xml +-priv-app/CNEService/CNEService.apk vendor/bin/cnd +vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml +vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml +vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml +vendor/etc/cne/wqeclient/ATT/ATT_profile4.xml +vendor/etc/cne/wqeclient/ATT/ATT_profile5.xml +vendor/etc/cne/wqeclient/ATT/ATT_profile6.xml vendor/etc/cne/wqeclient/ROW/ROW_profile1.xml vendor/etc/cne/wqeclient/ROW/ROW_profile2.xml vendor/etc/cne/wqeclient/ROW/ROW_profile3.xml @@ -275,51 +243,35 @@ vendor/etc/cne/wqeclient/ROW/ROW_profile4.xml vendor/etc/cne/wqeclient/ROW/ROW_profile5.xml vendor/etc/cne/wqeclient/ROW/ROW_profile6.xml vendor/etc/cne/wqeclient/ROW/ROW_profile7.xml -vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml -vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml -vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml -vendor/etc/cne/wqeclient/ATT/ATT_profile4.xml -vendor/etc/cne/wqeclient/ATT/ATT_profile5.xml -vendor/etc/cne/wqeclient/ATT/ATT_profile6.xml vendor/etc/cne/wqeclient/VZW/VZW_profile1.xml vendor/etc/cne/wqeclient/VZW/VZW_profile2.xml vendor/etc/cne/wqeclient/VZW/VZW_profile3.xml vendor/etc/cne/wqeclient/VZW/VZW_profile4.xml vendor/etc/cne/wqeclient/VZW/VZW_profile5.xml vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml --vendor/lib/com.quicinc.cne.api@1.0.so --vendor/lib/com.quicinc.cne.constants@1.0.so --vendor/lib/com.quicinc.cne.constants@2.0.so --vendor/lib/com.quicinc.cne.server@1.0.so --vendor/lib/com.quicinc.cne.server@2.0.so +vendor/lib/com.quicinc.cne.api@1.0.so +vendor/lib/com.quicinc.cne.constants@1.0.so +vendor/lib/com.quicinc.cne.constants@2.0.so +vendor/lib/com.quicinc.cne.server@1.0.so +vendor/lib/com.quicinc.cne.server@2.0.so +vendor/lib/libcne.so vendor/lib/libcneapiclient.so +vendor/lib/libcneoplookup.so vendor/lib/libcneqmiutils.so -vendor/lib/libcne.so -vendor/lib/libwms.so vendor/lib/libwqe.so vendor/lib/libxml.so --vendor/lib64/com.quicinc.cne.api@1.0.so --vendor/lib64/com.quicinc.cne.constants@1.0.so --vendor/lib64/com.quicinc.cne.constants@2.0.so --vendor/lib64/com.quicinc.cne.server@1.0.so --vendor/lib64/com.quicinc.cne.server@2.0.so +vendor/lib64/com.quicinc.cne.api@1.0.so +vendor/lib64/com.quicinc.cne.constants@1.0.so +vendor/lib64/com.quicinc.cne.constants@2.0.so +vendor/lib64/com.quicinc.cne.server@1.0.so +vendor/lib64/com.quicinc.cne.server@2.0.so +vendor/lib64/libcne.so vendor/lib64/libcneapiclient.so +vendor/lib64/libcneoplookup.so vendor/lib64/libcneqmiutils.so -vendor/lib64/libcne.so -vendor/lib64/libwms.so vendor/lib64/libwqe.so vendor/lib64/libxml.so -# FIDO -vendor/lib/libFidoCryptoJNI.so -vendor/lib/libFidoCrypto.so -vendor/lib/libFIDOKeyProvisioning.so -vendor/lib/libFidoSuiJNI.so -vendor/lib64/libFidoCryptoJNI.so -vendor/lib64/libFidoCrypto.so -vendor/lib64/libFIDOKeyProvisioning.so -vendor/lib64/libFidoSuiJNI.so - # Fingerprint lib64/hw/fingerprint.qcom.so vendor/lib64/libqvop-service.so @@ -329,6 +281,29 @@ vendor/lib/libqvop-service.so vendor/lib64/hw/gatekeeper.msm8996.so vendor/lib/hw/gatekeeper.msm8996.so +# DPM +vendor/bin/dpmQmiMgr +vendor/lib64/com.qualcomm.qti.dpm.api@1.0_vendor.so +vendor/lib64/libdpmqmihal.so +vendor/lib/com.qualcomm.qti.dpm.api@1.0_vendor.so +vendor/lib/libdpmqmihal.so + +# DRM and SEE +vendor/bin/qseecomd +vendor/lib64/libGPreqcancel.so +vendor/lib64/libGPreqcancel_svc.so +vendor/lib64/libQSEEComAPI.so +vendor/lib64/libSecureUILib.so +vendor/lib64/libStDrvInt.so +vendor/lib64/libdrmfs.so +vendor/lib64/libdrmtime.so +vendor/lib64/libqisl.so +vendor/lib64/librpmb.so +vendor/lib64/libsecureui.so +vendor/lib64/libsecureui_svcsock.so +vendor/lib64/libssd.so +vendor/lib/libQSEEComAPI.so + # GPS etc/permissions/com.qti.location.sdk.xml etc/permissions/com.qualcomm.location.xml @@ -344,8 +319,6 @@ vendor/bin/loc_launcher vendor/bin/lowi-server vendor/bin/slim_daemon vendor/bin/xtra-daemon -vendor/bin/xtwifi-client -vendor/bin/xtwifi-inet-agent vendor/etc/cacert_location.pem vendor/etc/init/vendor.qti.gnss@1.0-service.rc vendor/etc/xtra_root_cert.pem @@ -353,6 +326,7 @@ vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so vendor/lib64/libalarmservice_jni.so vendor/lib64/libdataitems.so vendor/lib64/libdrplugin_client.so +vendor/lib64/lib_drplugin_server.so vendor/lib64/libDRPlugin.so vendor/lib64/libevent_observer.so vendor/lib64/libflp.so @@ -379,122 +353,132 @@ vendor/lib/egl/eglSubDriverAndroid.so vendor/lib/egl/libEGL_adreno.so vendor/lib/egl/libGLESv1_CM_adreno.so vendor/lib/egl/libGLESv2_adreno.so -vendor/lib/egl/libQTapGLES.so vendor/lib/egl/libq3dtools_adreno.so -vendor/lib/hw/vulkan.msm8996.so -vendor/lib/libC2D2.so -vendor/lib/libCB.so -vendor/lib/libOpenCL.so -vendor/lib/libqseed3.so -vendor/lib/libRSDriver_adreno.so +vendor/lib/egl/libQTapGLES.so vendor/lib/libadreno_utils.so vendor/lib/libbccQTI.so -vendor/lib/libc2d30-a5xx.so +vendor/lib/libC2D2.so vendor/lib/libc2d30_bltlib.so +vendor/lib/libc2d30-a5xx.so +vendor/lib/libCB.so vendor/lib/libgsl.so vendor/lib/libllvm-glnext.so vendor/lib/libllvm-qcom.so vendor/lib/libllvm-qgl.so vendor/lib/libmm-disp-apis.so vendor/lib/libmm-qdcm.so -vendor/lib/librs_adreno.so +vendor/lib/libOpenCL.so vendor/lib/librs_adreno_sha1.so -vendor/lib/libscalar.so -vendor/lib/libsdm-color.so -vendor/lib/libsdm-diag.so -vendor/lib/libsdm-disp-apis.so -vendor/lib/libsdmextension.so --vendor/lib/libsdm-disp-vndapis.so -vendor/lib/libtinyxml2_1.so +vendor/lib/librs_adreno.so +vendor/lib/libRSDriver_adreno.so vendor/lib64/egl/eglSubDriverAndroid.so vendor/lib64/egl/libEGL_adreno.so vendor/lib64/egl/libGLESv1_CM_adreno.so vendor/lib64/egl/libGLESv2_adreno.so -vendor/lib64/egl/libQTapGLES.so vendor/lib64/egl/libq3dtools_adreno.so -vendor/lib64/hw/vulkan.msm8996.so -vendor/lib64/libC2D2.so -vendor/lib64/libCB.so -vendor/lib64/libOpenCL.so -vendor/lib64/libqseed3.so -vendor/lib64/libRSDriver_adreno.so +vendor/lib64/egl/libQTapGLES.so vendor/lib64/libadreno_utils.so vendor/lib64/libbccQTI.so -vendor/lib64/libc2d30-a5xx.so +vendor/lib64/libC2D2.so vendor/lib64/libc2d30_bltlib.so +vendor/lib64/libc2d30-a5xx.so +vendor/lib64/libCB.so vendor/lib64/libgsl.so vendor/lib64/libllvm-glnext.so vendor/lib64/libllvm-qcom.so vendor/lib64/libllvm-qgl.so vendor/lib64/libmm-disp-apis.so vendor/lib64/libmm-qdcm.so -vendor/lib64/librs_adreno.so +vendor/lib64/libOpenCL.so vendor/lib64/librs_adreno_sha1.so +vendor/lib64/librs_adreno.so +vendor/lib64/libRSDriver_adreno.so + +# Graphics (HDR) +vendor/lib/libhdr_tm.so +vendor/lib64/libhdr_tm.so + +# Graphics (SDM) +lib/libsdm-disp-apis.so:vendor/lib/libsdm-disp-apis.so +lib64/libsdm-disp-apis.so:vendor/lib64/libsdm-disp-apis.so vendor/lib64/libscalar.so vendor/lib64/libsdm-color.so vendor/lib64/libsdm-diag.so -vendor/lib64/libsdm-disp-apis.so -vendor/lib64/libsdmextension.so -vendor/lib64/libsdm-disp-vndapis.so +vendor/lib64/libsdmextension.so vendor/lib64/libtinyxml2_1.so +vendor/lib/libscalar.so +vendor/lib/libsdm-color.so +vendor/lib/libsdm-diag.so +-vendor/lib/libsdm-disp-vndapis.so +vendor/lib/libsdmextension.so +vendor/lib/libtinyxml2_1.so -# Graphics - HDR -vendor/lib/libhdr_tm.so -vendor/lib64/libhdr_tm.so +# Graphics (Vulkan) +vendor/lib/hw/vulkan.msm8996.so +vendor/lib64/hw/vulkan.msm8996.so # Graphics firmware -etc/firmware/a225_pfp.fw -etc/firmware/a225_pm4.fw -etc/firmware/a225p5_pm4.fw -etc/firmware/a300_pfp.fw -etc/firmware/a300_pm4.fw -etc/firmware/a330_pfp.fw -etc/firmware/a330_pm4.fw -etc/firmware/a420_pfp.fw -etc/firmware/a420_pm4.fw -etc/firmware/a530_gpmu.fw2 -etc/firmware/a530_pfp.fw -etc/firmware/a530_pm4.fw -etc/firmware/a530_zap.b00 -etc/firmware/a530_zap.b01 -etc/firmware/a530_zap.b02 -etc/firmware/a530_zap.elf -etc/firmware/a530_zap.mdt -etc/firmware/a540_gpmu.fw2 -etc/firmware/a530v1_pfp.fw -etc/firmware/a530v1_pm4.fw -etc/firmware/a530v2_seq.fw2 -etc/firmware/a530v3_gpmu.fw2 -etc/firmware/a530v3_seq.fw2 -etc/firmware/leia_pfp_470.fw -etc/firmware/leia_pm4_470.fw +vendor/firmware/a225_pfp.fw +vendor/firmware/a225_pm4.fw +vendor/firmware/a225p5_pm4.fw +vendor/firmware/a300_pfp.fw +vendor/firmware/a300_pm4.fw +vendor/firmware/a330_pfp.fw +vendor/firmware/a330_pm4.fw +vendor/firmware/a420_pfp.fw +vendor/firmware/a420_pm4.fw +vendor/firmware/a530_gpmu.fw2 +vendor/firmware/a530_pfp.fw +vendor/firmware/a530_pm4.fw +vendor/firmware/a530_zap.b00 +vendor/firmware/a530_zap.b01 +vendor/firmware/a530_zap.b02 +vendor/firmware/a530_zap.elf +vendor/firmware/a530_zap.mdt +vendor/firmware/a540_gpmu.fw2 +vendor/firmware/a530v1_pfp.fw +vendor/firmware/a530v1_pm4.fw +vendor/firmware/a530v2_seq.fw2 +vendor/firmware/a530v3_gpmu.fw2 +vendor/firmware/a530v3_seq.fw2 +vendor/firmware/leia_pfp_470.fw +vendor/firmware/leia_pm4_470.fw # IMS +-app/ims/ims.apk +etc/permissions/qti-vzw-ims-internal.xml lib/com.qualcomm.qti.imscmservice@1.0.so -lib/lib-imsvt.so +lib/lib-imscamera.so +lib/lib-imsvideocodec.so +lib/lib-imsvtextutils.so +lib/lib-imsvtutils.so +lib/libdiag_system.so +lib/libimscamera_jni.so +lib/libimsmedia_jni.so +lib/librcc.so lib/vendor.qti.imsrtpservice@1.0.so lib64/com.qualcomm.qti.imscmservice@1.0.so +lib64/lib-imscamera.so +lib64/lib-imsvideocodec.so lib64/lib-imsvt.so +lib64/lib-imsvtextutils.so +lib64/lib-imsvtutils.so +lib64/libdiag_system.so +lib64/libimscamera_jni.so +lib64/libimsmedia_jni.so +lib64/librcc.so lib64/vendor.qti.imsrtpservice@1.0.so --vendor/app/imssettings/imssettings.apk --vendor/app/ims/ims.apk vendor/bin/ims_rtp_daemon vendor/bin/imsdatadaemon vendor/bin/imsqmidaemon vendor/bin/imsrcsd +vendor/framework/qti-vzw-ims-internal.jar vendor/lib/com.qualcomm.qti.imscmservice@1.0_vendor.so -vendor/lib/lib-dplmedia.so -vendor/lib/lib-imsSDP.so vendor/lib/lib-imscmservice.so -vendor/lib/lib-imsdpl.so -vendor/lib/lib-imsqimf.so -vendor/lib/lib-imsxml.so -vendor/lib/lib-rtpcommon.so -vendor/lib/lib-rtpcore.so -vendor/lib/lib-rtpdaemoninterface.so -vendor/lib/lib-rtpsl.so -vendor/lib/vendor.qti.imsrtpservice@1.0_vendor.so +vendor/lib/lib-uceservice.so vendor/lib/vendor.qti.imsrtpservice@1.0-service-Impl.so +vendor/lib/vendor.qti.imsrtpservice@1.0_vendor.so vendor/lib64/com.qualcomm.qti.imscmservice@1.0_vendor.so vendor/lib64/lib-dplmedia.so vendor/lib64/lib-imsSDP.so @@ -507,8 +491,6 @@ vendor/lib64/lib-rtpcore.so vendor/lib64/lib-rtpdaemoninterface.so vendor/lib64/lib-rtpsl.so vendor/lib64/lib-uceservice.so -vendor/lib64/libimsmedia_jni.so -vendor/lib64/libimscamera_jni.so vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so vendor/lib64/vendor.qti.imsrtpservice@1.0_vendor.so @@ -517,6 +499,7 @@ vendor/lib64/hw/keystore.msm8996.so vendor/lib/hw/keystore.msm8996.so # Listen +vendor/lib64/hw/sound_trigger.primary.msm8996.so vendor/lib/hw/sound_trigger.primary.msm8996.so vendor/lib/libadpcmdec.so vendor/lib/libsmwrapper.so @@ -525,62 +508,52 @@ vendor/lib64/hw/sound_trigger.primary.msm8996.so vendor/lib64/vendor.qti.voiceprint@1.0.so # Media -lib64/libextmedia_jni.so -vendor/lib/libgpustats.so vendor/lib/libI420colorconvert.so vendor/lib/libOmxAacDec.so vendor/lib/libOmxAlacDec.so vendor/lib/libOmxAlacDecSw.so +vendor/lib/libOmxAmrDec.so vendor/lib/libOmxAmrwbplusDec.so vendor/lib/libOmxApeDec.so vendor/lib/libOmxApeDecSw.so vendor/lib/libOmxEvrcDec.so vendor/lib/libOmxQcelp13Dec.so vendor/lib/libOmxVideoDSMode.so +vendor/lib/libOmxVpp.so vendor/lib/libOmxWmaDec.so vendor/lib/libmm-color-convertor.so vendor/lib/libvpphvx.so -vendor/lib/libvqzip.so -vendor/lib/libOmxAmrDec.so -vendor/lib/libOmxVpp.so vendor/lib/libvpplibrary.so +vendor/lib/libvqzip.so -vendor/lib64/libgpustats.so -vendor/lib64/libOmxAmrDec.so -vendor/lib64/libOmxVpp.so -vendor/lib64/libvpplibrary.so -vendor/lib64/libmm-color-convertor.so vendor/lib64/libI420colorconvert.so vendor/lib64/libOmxAacDec.so vendor/lib64/libOmxAlacDec.so vendor/lib64/libOmxAlacDecSw.so +vendor/lib64/libOmxAmrDec.so vendor/lib64/libOmxAmrwbplusDec.so vendor/lib64/libOmxApeDec.so vendor/lib64/libOmxApeDecSw.so vendor/lib64/libOmxEvrcDec.so vendor/lib64/libOmxQcelp13Dec.so +vendor/lib64/libOmxVpp.so vendor/lib64/libOmxWmaDec.so +vendor/lib64/libmm-color-convertor.so vendor/lib64/libvpphvx.so - -# NXP Amplifier -lib64/libtfa98xx.so -lib/libtfa98xx.so +vendor/lib64/libvpplibrary.so # Perf -lib/libqti_performance.so -lib/libqti-perfd-client_system.so lib/vendor.qti.hardware.iop@1.0.so lib/vendor.qti.hardware.perf@1.0.so -lib64/libqti_performance.so -lib64/libqti-perfd-client_system.so lib64/vendor.qti.hardware.iop@1.0.so lib64/vendor.qti.hardware.perf@1.0.so vendor/bin/energy-awareness -vendor/bin/msm_irqbalance vendor/bin/hw/vendor.qti.hardware.iop@1.0-service vendor/bin/hw/vendor.qti.hardware.perf@1.0-service -vendor/etc/msm_irqbalance.conf vendor/etc/init/vendor.qti.hardware.iop@1.0-service.rc vendor/etc/init/vendor.qti.hardware.perf@1.0-service.rc +vendor/etc/perf/perfboostsconfig.xml vendor/etc/perf/perf-profile0.conf vendor/etc/perf/perf-profile1.conf vendor/etc/perf/perf-profile2.conf @@ -588,21 +561,24 @@ vendor/etc/perf/perf-profile3.conf vendor/etc/perf/perf-profile4.conf vendor/etc/perf/perf-profile5.conf vendor/etc/perf/perf-profile6.conf -vendor/etc/perf/perfboostsconfig.xml +vendor/lib/hw/vendor.qti.hardware.iop@1.0-impl.so +vendor/lib/libfeedbackhandler.so vendor/lib/libperfgluelayer.so -vendor/lib/libqti-iopd-client.so vendor/lib/libqti-iopd.so +vendor/lib/libqti-iopd-client.so +vendor/lib/libqti-perfd.so vendor/lib/libqti-perfd-client.so vendor/lib/libqti-util.so -vendor/lib/hw/vendor.qti.hardware.iop@1.0-impl.so vendor/lib/vendor.qti.hardware.iop@1.0_vendor.so vendor/lib/vendor.qti.hardware.perf@1.0_vendor.so +vendor/lib64/hw/vendor.qti.hardware.iop@1.0-impl.so +vendor/lib64/libfeedbackhandler.so vendor/lib64/libperfgluelayer.so -vendor/lib64/libqti-iopd-client.so vendor/lib64/libqti-iopd.so +vendor/lib64/libqti-iopd-client.so +vendor/lib64/libqti-perfd.so vendor/lib64/libqti-perfd-client.so vendor/lib64/libqti-util.so -vendor/lib64/hw/vendor.qti.hardware.iop@1.0-impl.so vendor/lib64/vendor.qti.hardware.iop@1.0_vendor.so vendor/lib64/vendor.qti.hardware.perf@1.0_vendor.so @@ -615,31 +591,35 @@ vendor/lib/libperipheral_client.so # Postprocessing etc/permissions/com.qti.snapdragon.sdk.display.xml framework/com.qti.snapdragon.sdk.display.jar +lib/libsd_sdk_display.so:vendor/lib/libsd_sdk_display.so lib/vendor.display.color@1.0.so lib/vendor.display.postproc@1.0.so lib/vendor.qti.hardware.qdutils_disp@1.0.so +lib64/libsd_sdk_display.so:vendor/lib64/libsd_sdk_display.so lib64/vendor.display.color@1.0.so lib64/vendor.display.postproc@1.0.so lib64/vendor.qti.hardware.qdutils_disp@1.0.so --vendor/app/colorservice/colorservice.apk -vendor/bin/mm-pp-dpps vendor/bin/hw/vendor.display.color@1.0-service vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti +vendor/bin/mm-pp-dpps vendor/etc/init/vendor.display.color@1.0-service.rc vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc -vendor/lib/libsd_sdk_display.so -vendor/lib/vendor.display.color@1.0_vendor.so -vendor/lib/vendor.display.postproc@1.0_vendor.so -vendor/lib/vendor.qti.hardware.qdutils_disp@1.0_vendor.so vendor/lib64/libdisp-aba.so -vendor/lib64/libsd_sdk_display.so vendor/lib64/vendor.display.color@1.0_vendor.so vendor/lib64/vendor.display.postproc@1.0_vendor.so vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0_vendor.so +vendor/lib/libdisp-aba.so +vendor/lib/vendor.display.color@1.0_vendor.so +vendor/lib/vendor.display.postproc@1.0_vendor.so +vendor/lib/vendor.qti.hardware.qdutils_disp@1.0_vendor.so # QMI -vendor/bin/irsc_util etc/permissions/qti_permissions.xml +lib/libdiag_system.so +lib/libqmi_cci_system.so +lib64/libdiag_system.so +lib64/libqmi_cci_system.so +vendor/bin/irsc_util vendor/lib/libdiag.so vendor/lib/libdsi_netctrl.so vendor/lib/libdsutils.so @@ -653,8 +633,8 @@ vendor/lib/libqmi_client_qmux.so vendor/lib/libqmi_common_so.so vendor/lib/libqmi_csi.so vendor/lib/libqmi_encdec.so -vendor/lib/libqmiservices.so vendor/lib/libqmi.so +vendor/lib/libqmiservices.so vendor/lib/libsmemlog.so vendor/lib64/libdiag.so vendor/lib64/libdsi_netctrl.so @@ -669,61 +649,26 @@ vendor/lib64/libqmi_client_qmux.so vendor/lib64/libqmi_common_so.so vendor/lib64/libqmi_csi.so vendor/lib64/libqmi_encdec.so -vendor/lib64/libqmiservices.so vendor/lib64/libqmi.so +vendor/lib64/libqmiservices.so vendor/lib64/libsmemlog.so -# QSEE -vendor/bin/qseecomd -vendor/lib/libStDrvInt.so -vendor/lib/libcppf.so -vendor/lib/libqisl.so -vendor/lib/librpmb.so -vendor/lib/libssd.so -vendor/lib/lib-sec-disp.so -vendor/lib/libQSEEComAPI.so -vendor/lib/libtzdrmgenprov.so -vendor/lib64/lib-sec-disp.so -vendor/lib64/libGPreqcancel.so -vendor/lib64/libGPreqcancel_svc.so -vendor/lib64/libQSEEComAPI.so -vendor/lib64/libSecureUILib.so -vendor/lib64/libStDrvInt.so -vendor/lib64/libdrmfs.so -vendor/lib64/libdrmtime.so -vendor/lib64/libqisl.so -vendor/lib64/librpmb.so -vendor/lib64/libsecureui.so -vendor/lib64/libsecureui_svcsock.so -vendor/lib64/libssd.so -vendor/lib64/libtzdrmgenprov.so - -# Radio +# RIL -app/QtiTelephonyService/QtiTelephonyService.apk -bin/port-bridge -etc/permissions/telephonyservice.xml etc/permissions/qcrilhook.xml -etc/permissions/qcnvitems.xml -etc/permissions/qti-vzw-ims-internal.xml +etc/permissions/telephonyservice.xml +-framework/QtiTelephonyServicelibrary.jar -framework/qcrilhook.jar --framework/qcnvitems.jar -framework/QtiTelephonyServicelibrary.jar -framework/qti-telephony-common.jar|2eba987ae297a892e895ec1e9a302b41dbe0232e -lib64/libparam.so +-framework/qti-telephony-common.jar|2eba987ae297a892e895ec1e9a302b41dbe0232e -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk vendor/bin/netmgrd -vendor/bin/pd-mapper vendor/bin/qti vendor/bin/rmt_storage vendor/bin/tftp_server vendor/etc/data/dsi_config.xml vendor/etc/data/netmgr_config.xml -vendor/etc/RIDL/qdss.cfg -vendor/framework/qti-vzw-ims-internal.jar vendor/lib/libmdmdetect.so vendor/lib/libqcmaputils.so -vendor/lib/libqti-at.so -vendor/lib/lib_remote_simlock.so vendor/lib/vendor.qti.hardware.radio.am@1.0_vendor.so vendor/lib/vendor.qti.hardware.radio.ims@1.0_vendor.so vendor/lib/vendor.qti.hardware.radio.lpa@1.0_vendor.so @@ -737,7 +682,6 @@ vendor/lib64/liblqe.so vendor/lib64/libmdmdetect.so vendor/lib64/libnetmgr.so vendor/lib64/libqcmaputils.so -vendor/lib64/libqti-at.so vendor/lib64/libril-qc-ltedirectdisc.so vendor/lib64/libril-qc-qmi-1.so vendor/lib64/libril-qc-radioconfig.so @@ -745,7 +689,6 @@ vendor/lib64/libril-qcril-hook-oem.so vendor/lib64/librilqmiservices.so vendor/lib64/libsettings.so vendor/lib64/libsystem_health_mon.so -vendor/lib64/lib_remote_simlock.so vendor/lib64/vendor.qti.hardware.radio.am@1.0_vendor.so vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0_vendor.so vendor/lib64/vendor.qti.hardware.radio.ims@1.0_vendor.so @@ -759,8 +702,6 @@ vendor/radio/qcril_database/qcril.db # Sensors vendor/bin/sensors.qcom -vendor/etc/sensors/hals.conf -vendor/etc/sensors/sensor_def_qcomdev.conf vendor/lib/hw/activity_recognition.msm8996.so vendor/lib/libsensor_reg.so vendor/lib/libsensor1.so @@ -772,29 +713,20 @@ vendor/lib64/sensors.ssc.so # Thermal vendor/bin/thermal-engine -vendor/lib/libthermalclient.so +-vendor/lib64/libthermalclient.so vendor/lib64/libthermalioctl.so -vendor/lib64/libthermalclient.so +-vendor/lib/libthermalclient.so -# Time service +# Time services -vendor/app/TimeService/TimeService.apk vendor/bin/time_daemon -vendor/lib64/libTimeService.so vendor/lib64/libtime_genoff.so -# TUI -lib/vendor.qti.hardware.tui_comm@1.0.so -lib64/vendor.qti.hardware.tui_comm@1.0.so -vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti -vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc -vendor/lib/vendor.qti.hardware.tui_comm@1.0_vendor.so -vendor/lib64/vendor.qti.hardware.tui_comm@1.0_vendor.so - -# Widevine -vendor/lib/libWVStreamControlAPI_L3.so -vendor/lib/libwvdrm_L3.so -vendor/lib/mediadrm/libwvdrmengine.so +# Widevine DRM +vendor/bin/hw/android.hardware.drm@1.0-service.widevine +vendor/etc/init/android.hardware.drm@1.0-service.widevine.rc +vendor/lib/libwvhidl.so # WiFi -bin/cnss-daemon +vendor/bin/cnss-daemon etc/firmware/bdwlan30.bin -- cgit v1.2.3 From 0610c89f4624e6640b6edc1418bb69686c00ec60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 19:55:26 +0100 Subject: msm8996-common: Restore port-bridge and fix its path. --- proprietary-files.txt | 1 + rootdir/etc/init.qcom.rc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 376407c..ee254f0 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -661,6 +661,7 @@ etc/permissions/telephonyservice.xml -framework/qcrilhook.jar -framework/qti-telephony-common.jar|2eba987ae297a892e895ec1e9a302b41dbe0232e -priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk +vendor/bin/port-bridge vendor/bin/netmgrd vendor/bin/qti vendor/bin/rmt_storage diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index ecbd951..e5db2c8 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -742,7 +742,7 @@ service ftmd /system/bin/logwrapper /system/bin/ftmdaemon disabled oneshot -service port-bridge /system/bin/port-bridge +service port-bridge /vendor/bin/port-bridge class main user radio system group radio system inet -- cgit v1.2.3 From 166c635c2f8fa7b358ae5b276943fd97b1c80b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 20:01:41 +0100 Subject: msm8996-common: Use TARGET_OUT_VENDOR_EXECUTABLES for all qcom shell scripts --- rootdir/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index eb67fd2..bc0e71a 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -42,7 +42,7 @@ LOCAL_MODULE := init.qcom.usb.sh LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := etc/init.qcom.usb.sh -LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -50,7 +50,7 @@ LOCAL_MODULE := init.qcom.bt.sh LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_SRC_FILES := etc/init.qcom.bt.sh -LOCAL_VENDOR_MODULE := true +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) include $(BUILD_PREBUILT) include $(CLEAR_VARS) -- cgit v1.2.3 From 43c35c9e4bafe83c22819221b8b22f2503bad4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 20:04:32 +0100 Subject: msm8996-common: Fix permissions for rc and sh files. --- rootdir/etc/init.qcom.power.rc | 0 rootdir/etc/init.qcom.rc | 0 rootdir/etc/init.qcom.sensors.sh | 0 rootdir/etc/init.qcom.usb.rc | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 rootdir/etc/init.qcom.power.rc mode change 100755 => 100644 rootdir/etc/init.qcom.rc mode change 100644 => 100755 rootdir/etc/init.qcom.sensors.sh mode change 100755 => 100644 rootdir/etc/init.qcom.usb.rc diff --git a/rootdir/etc/init.qcom.power.rc b/rootdir/etc/init.qcom.power.rc old mode 100755 new mode 100644 diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc old mode 100755 new mode 100644 diff --git a/rootdir/etc/init.qcom.sensors.sh b/rootdir/etc/init.qcom.sensors.sh old mode 100644 new mode 100755 diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc old mode 100755 new mode 100644 -- cgit v1.2.3 From a20cb11d6e50e3fa1b06679a4f21bab9586cd49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 20:15:49 +0100 Subject: msm8996-common: cnss-daemon: /system/bin -> /vendor/bin. --- rootdir/etc/init.qcom.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index e5db2c8..e7018a8 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -813,7 +813,7 @@ service wifi_fccutild /system/bin/wifi_fccutild disabled oneshot -service cnss-daemon /system/bin/cnss-daemon -n -l +service cnss-daemon /vendor/bin/cnss-daemon -n -l class late_start user system group system inet net_admin wifi -- cgit v1.2.3 From bc6c1a4554847d317521829c89cdb776e64b8528 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Sun, 4 Feb 2018 18:51:25 +0100 Subject: msm8996-common: rootdir: Remove length from userdata * Current code expects lenght to be the real partition size > The footer is automatically added now Change-Id: I47165062ae0b15c935c8b1c561b9788ff825c4f5 --- rootdir/etc/fstab.full | 4 ++-- rootdir/etc/fstab.qcom | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full index 8f3aa35..a7d2c4e 100644 --- a/rootdir/etc/fstab.full +++ b/rootdir/etc/fstab.full @@ -10,8 +10,8 @@ /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait /dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,length=-16384 -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,length=-16384 +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index d50afd4..b1bc993 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -9,8 +9,8 @@ # /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/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,length=-16384 -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,length=-16384 +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait -- cgit v1.2.3 From 2aa10a60e6699197966bf2661bd3f4ca9081f36c Mon Sep 17 00:00:00 2001 From: Mahantesh Sanakall Date: Mon, 14 Aug 2017 21:20:01 +0530 Subject: msm8996-common: Enable quota feature for userdata partition. This will enable quota feature for the data partition. Change-Id: I45f54583d84a67c2097065a29fe67b1012dfcc12 --- rootdir/etc/fstab.full | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full index a7d2c4e..9b63c3d 100644 --- a/rootdir/etc/fstab.full +++ b/rootdir/etc/fstab.full @@ -10,8 +10,8 @@ /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait /dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,quota +/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,quota /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait -- cgit v1.2.3 From 0c2a9063300d49758e785ac5786ab965af41643f Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 5 Feb 2018 12:27:10 +0000 Subject: msm8996-common: rootdir: Stop creating useless folders under /data Change-Id: I910c9f574e842410e8a09c1c1d0d82be51d6026c --- rootdir/etc/init.qcom.rc | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index e7018a8..625edff 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -280,10 +280,8 @@ on post-fs-data mkdir /persist/qc_senseid 0700 system system mkdir /persist/bms 0700 root system restorecon_recursive /persist - mkdir /data/misc/dts 0770 media audio mkdir /data/usf 0700 system system mkdir /data/misc/qvop 0660 system system - mkdir /data/misc/audio_pp 0771 media audio # Create directory used by display clients mkdir /data/vendor/display 0770 system graphics @@ -294,9 +292,6 @@ on post-fs-data mkdir /data/vendor/misc/qti_fp/calib_test 0770 system system mkdir /data/vendor/misc/qti_fp/database 0770 system system - # Create directory for TZ Apps - mkdir /data/misc/qsee 0770 system system - # Create folder for mm-qcamera-daemon mkdir /data/misc/camera 0770 camera camera @@ -332,9 +327,6 @@ on post-fs-data mkdir /data/connectivity 0771 system system chown system system /data/connectivity - mkdir /data/dpm/nsrm 0771 system system - chown system system /data/dpm/nsrm - # Create directory used by audio subsystem mkdir /data/misc/audio 0770 audio audio @@ -342,9 +334,6 @@ on post-fs-data mkdir /data/misc/audio/acdbdata 0770 media audio mkdir /data/misc/audio/acdbdata/delta 0770 media audio - # Create directory used by the DASH client - mkdir /data/misc/dash 0770 media audio - # Create directory for radio mkdir /data/vendor/radio 0770 system radio @@ -363,23 +352,11 @@ on post-fs-data chown system system /sys/devices/platform/msm_sdcc.3/polling chown system system /sys/devices/platform/msm_sdcc.4/polling - # Create the symlink to qcn wpa_supplicant folder for ar6000 wpa_supplicant - mkdir /data/system 0775 system system - - #symlink /data/misc/wifi/wpa_supplicant /data/system/wpa_supplicant # Create directories for Location services mkdir /data/vendor/location 0770 gps gps mkdir /data/vendor/location/mq 0770 gps gps mkdir /data/vendor/location/xtwifi 0770 gps gps - # Create directory from IMS services - mkdir /data/shared 0755 - chown system system /data/shared - - # Create directory for FOTA - mkdir /data/fota 0771 - chown system system /data/fota - # Create /data/time folder for time-services mkdir /data/time/ 0700 system system mkdir /data/audio/ 0770 media audio @@ -396,14 +373,6 @@ on post-fs-data mkdir /data/misc/fm 0770 system system chmod 0770 /data/misc/fm - # RIDL data - mkdir /data/misc/SelfHost/ 0710 system shell - mkdir /data/misc/SelfHost/QCLogs/ 2750 system shell - mkdir /data/misc/SelfHost/QCLogs/temp/ 0700 system shell - mkdir /data/misc/SelfHost/storage/ 0700 system shell - mkdir /data/misc/SelfHost/Running/ 2750 system shell - mkdir /data/misc/SelfHost/socket/ 2770 system system - #Create PERFD deamon related dirs mkdir /data/vendor/perfd 0770 root system chmod 2770 /data/vendor/perfd -- cgit v1.2.3 From 09ecc3011a3ebde207ed9ed8d6b1ec4ae7b21f7d Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Thu, 1 Feb 2018 19:07:54 +0100 Subject: msm8996-common: rootdir: Remove unnecessary /persist permissions * We mount /persist in fstab so this is useless. Change-Id: I62cec54e22af6207114eca94c2c80275ece30443 --- rootdir/etc/init.qcom.rc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 625edff..4ea368a 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -337,10 +337,6 @@ on post-fs-data # Create directory for radio mkdir /data/vendor/radio 0770 system radio - # Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections - # We chown/chmod /persist again so because mount is run as root + defaults - chown system system /persist - chmod 0771 /persist chmod 0664 /sys/devices/platform/msm_sdcc.1/polling chmod 0664 /sys/devices/platform/msm_sdcc.2/polling chmod 0664 /sys/devices/platform/msm_sdcc.3/polling -- cgit v1.2.3 From 559ae9622e248302c3ee86af9e5532e651888fa6 Mon Sep 17 00:00:00 2001 From: Naresh Tanniru Date: Mon, 5 Jun 2017 22:25:38 +0530 Subject: msm8996-common: init.qcom.rc: Create /data/vendor folder for audio - for audio acdb and dump files create /data/vendor folder Change-Id: If24a072d3686c3740ba36a3d6eb1849b4a769a3b --- rootdir/etc/init.qcom.rc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 4ea368a..03451ec 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -1,4 +1,4 @@ -# Copyright (c) 2009-2012, 2014-2015, The Linux Foundation. All rights reserved. +# Copyright (c) 2009-2012, 2014-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: @@ -271,6 +271,9 @@ on boot # msm specific files that need to be created on /data on post-fs-data + mkdir /data/vendor 0770 system system + mkdir /data/vendor/misc 0770 system system + mkdir /tombstones/modem 0771 system system mkdir /tombstones/lpass 0771 system system mkdir /tombstones/wcnss 0771 system system @@ -328,11 +331,11 @@ on post-fs-data chown system system /data/connectivity # Create directory used by audio subsystem - mkdir /data/misc/audio 0770 audio audio + mkdir /data/vendor/misc/audio 0770 audio audio # Create directory for audio delta files - mkdir /data/misc/audio/acdbdata 0770 media audio - mkdir /data/misc/audio/acdbdata/delta 0770 media audio + mkdir /data/vendor/misc/audio/acdbdata 0770 media audio + mkdir /data/vendor/misc/audio/acdbdata/delta 0770 media audio # Create directory for radio mkdir /data/vendor/radio 0770 system radio -- cgit v1.2.3 From 2ec08caba486c2bb7f68539fc7954b445d6c49df Mon Sep 17 00:00:00 2001 From: Saurabh Srivastava Date: Mon, 5 Jun 2017 18:07:21 +0530 Subject: msm8996-common: Fixing permission for /data/vendor Removing creation of /data/vendor with system group access. CRs-Fixed: 2055140 Change-Id: Ic9fb98ea1420769f2ffa5262fd6e1a82ad848941 --- rootdir/etc/init.qcom.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 03451ec..96fd101 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -271,7 +271,6 @@ on boot # msm specific files that need to be created on /data on post-fs-data - mkdir /data/vendor 0770 system system mkdir /data/vendor/misc 0770 system system mkdir /tombstones/modem 0771 system system -- cgit v1.2.3 From d9fb201633ea5899b527348ae4a2b33bc3ef1972 Mon Sep 17 00:00:00 2001 From: Aditya Bavanari Date: Fri, 14 Jul 2017 20:06:30 +0530 Subject: msm8996-common: init.qcom.rc: Modify permissions for /data/vendor/misc Modify permissions for /data/vendor/misc to 01771 from 0770 in order to enable audio module to access the directory. CRs-Fixed: 2074932 Change-Id: Ibc832cd0ec7c04a99b3fa1e9a554f919e11a149a --- rootdir/etc/init.qcom.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 96fd101..24fa31d 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -271,7 +271,7 @@ on boot # msm specific files that need to be created on /data on post-fs-data - mkdir /data/vendor/misc 0770 system system + mkdir /data/vendor/misc 01771 system system mkdir /tombstones/modem 0771 system system mkdir /tombstones/lpass 0771 system system -- cgit v1.2.3 From 0d39a55fb766fc4af4386e973f28c796a8d6bf9a Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Thu, 1 Feb 2018 19:55:34 +0100 Subject: msm8996-common: rootdir: Move sections to reflect exec order Change-Id: I431fbcd9af56697dc0bc673b8c102579c208f620 --- rootdir/etc/init.qcom.rc | 282 +++++++++++++++++++++++------------------------ 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 24fa31d..44beffc 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -51,6 +51,15 @@ on init write /sys/module/qpnp_rtc/parameters/poweron_alarm 1 +on fs + wait /dev/block/platform/soc/${ro.boot.bootdevice} + symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice + restorecon_recursive /dev/block/platform/soc/${ro.boot.bootdevice} + mount_all /vendor/etc/fstab.qcom + + # Restorecon + restorecon_recursive /persist + on late-fs # boot time fs tune write /sys/block/sda/queue/iostats 0 @@ -60,6 +69,138 @@ on late-fs write /sys/block/dm-0/queue/read_ahead_kb 2048 write /sys/block/dm-1/queue/read_ahead_kb 2048 +# msm specific files that need to be created on /data +on post-fs-data + mkdir /data/vendor/misc 01771 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 /persist/data/sfs 0700 system system + mkdir /persist/data/tz 0700 system system + mkdir /persist/qc_senseid 0700 system system + mkdir /persist/bms 0700 root system + restorecon_recursive /persist + mkdir /data/usf 0700 system system + mkdir /data/misc/qvop 0660 system system + + # Create directory used by display clients + mkdir /data/vendor/display 0770 system graphics + + # Create directories for Fingerprint + mkdir /data/vendor/misc/qti_fp 0770 system system + mkdir /data/vendor/misc/qti_fp/bg_estimation 0770 system system + mkdir /data/vendor/misc/qti_fp/calib_test 0770 system system + mkdir /data/vendor/misc/qti_fp/database 0770 system system + + # Create folder for mm-qcamera-daemon + mkdir /data/misc/camera 0770 camera camera + + mkdir /data/media 0770 media_rw media_rw + chown media_rw media_rw /data/media + + # Create directory for tftp + mkdir /data/vendor/tombstones 0771 system system + mkdir /data/vendor/tombstones/rfs 0771 system system + + mkdir /data/misc/bluetooth 0770 bluetooth bluetooth + + # Create the directories used by the Wireless subsystem + mkdir /data/misc/wifi 0770 wifi wifi + mkdir /data/misc/wifi/sockets 0770 wifi wifi + mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi + mkdir /data/misc/dhcp 0770 dhcp dhcp + chown dhcp dhcp /data/misc/dhcp + + # Create port-bridge log dir + mkdir /data/misc/port_bridge 0770 radio radio + chmod 0770 /data/misc/port_bridge + + # Create netmgr log dir + mkdir /data/vendor/netmgr 0770 radio radio + chmod 0770 /data/vendor/netmgr + + # Create ipacm log dir + mkdir /data/vendor/ipa 0770 radio radio + chmod 0770 /data/vendor/ipa + + # Create the directories used by CnE subsystem + mkdir /data/connectivity 0771 system system + chown system system /data/connectivity + + # Create directory used by audio subsystem + mkdir /data/vendor/misc/audio 0770 audio audio + + # Create directory for audio delta files + mkdir /data/vendor/misc/audio/acdbdata 0770 media audio + mkdir /data/vendor/misc/audio/acdbdata/delta 0770 media audio + + # Create directory for radio + mkdir /data/vendor/radio 0770 system radio + + chmod 0664 /sys/devices/platform/msm_sdcc.1/polling + chmod 0664 /sys/devices/platform/msm_sdcc.2/polling + chmod 0664 /sys/devices/platform/msm_sdcc.3/polling + chmod 0664 /sys/devices/platform/msm_sdcc.4/polling + + # Chown polling nodes as needed from UI running on system server + chown system system /sys/devices/platform/msm_sdcc.1/polling + chown system system /sys/devices/platform/msm_sdcc.2/polling + chown system system /sys/devices/platform/msm_sdcc.3/polling + chown system system /sys/devices/platform/msm_sdcc.4/polling + + # Create directories for Location services + mkdir /data/vendor/location 0770 gps gps + mkdir /data/vendor/location/mq 0770 gps gps + mkdir /data/vendor/location/xtwifi 0770 gps gps + + # Create /data/time folder for time-services + mkdir /data/time/ 0700 system system + mkdir /data/audio/ 0770 media audio + + # Create a folder for audio delta files + mkdir /data/audio/acdbdata 0770 media audio + mkdir /data/audio/acdbdata/delta 0770 media audio + setprop vold.post_fs_data_done 1 + + # Create a folder for SRS to be able to create a usercfg file + mkdir /data/data/media 0770 media media + + # Create FM dir for patchdownloader + mkdir /data/misc/fm 0770 system system + chmod 0770 /data/misc/fm + + #Create PERFD deamon related dirs + mkdir /data/vendor/perfd 0770 root system + chmod 2770 /data/vendor/perfd + rm /data/vendor/perfd/default_values + + # NFC local data and nfcee xml storage + mkdir /data/nfc 0770 nfc nfc + mkdir /data/nfc/param 0770 nfc nfc + + #Create IOP deamon related dirs + mkdir /data/vendor/iop 0770 root system + + # Mark the copy complete flag to not completed + write /data/vendor/radio/copy_complete 0 + chown radio radio /data/vendor/radio/copy_complete + chmod 0660 /data/vendor/radio/copy_complete + + # copy prebuilt qcril.db files always + copy /vendor/radio/qcril_database/qcril.db /data/vendor/radio/qcril_prebuilt.db + chown radio radio /data/vendor/radio/qcril_prebuilt.db + chmod 0660 /data/vendor/radio/qcril_prebuilt.db + + # File flags for prebuilt ril db file + write /data/vendor/radio/prebuilt_db_support 1 + chown radio radio /data/vendor/radio/prebuilt_db_support + chmod 0400 /data/vendor/radio/prebuilt_db_support + write /data/vendor/radio/db_check_done 0 + chown radio radio /data/vendor/radio/db_check_done + chmod 0660 /data/vendor/radio/db_check_done + on early-boot # set RLIMIT_MEMLOCK to 64MB setrlimit 8 67108864 67108864 @@ -77,15 +218,6 @@ on early-boot write /sys/bus/msm_subsys/devices/subsys4/restart_level "related" write /sys/bus/msm_subsys/devices/subsys5/restart_level "related" -on fs - wait /dev/block/platform/soc/${ro.boot.bootdevice} - symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice - restorecon_recursive /dev/block/platform/soc/${ro.boot.bootdevice} - mount_all /vendor/etc/fstab.qcom - - # Restorecon - restorecon_recursive /persist - on boot # Secure touch chmod 0660 /sys/devices/soc/75ba000.i2c/i2c-12/12-004a/secure_touch_enable @@ -269,138 +401,6 @@ on boot # Allow access for WLAN firmware chown system system /sys/module/cnss_common/parameters/bdwlan_file -# msm specific files that need to be created on /data -on post-fs-data - mkdir /data/vendor/misc 01771 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 /persist/data/sfs 0700 system system - mkdir /persist/data/tz 0700 system system - mkdir /persist/qc_senseid 0700 system system - mkdir /persist/bms 0700 root system - restorecon_recursive /persist - mkdir /data/usf 0700 system system - mkdir /data/misc/qvop 0660 system system - - # Create directory used by display clients - mkdir /data/vendor/display 0770 system graphics - - # Create directories for Fingerprint - mkdir /data/vendor/misc/qti_fp 0770 system system - mkdir /data/vendor/misc/qti_fp/bg_estimation 0770 system system - mkdir /data/vendor/misc/qti_fp/calib_test 0770 system system - mkdir /data/vendor/misc/qti_fp/database 0770 system system - - # Create folder for mm-qcamera-daemon - mkdir /data/misc/camera 0770 camera camera - - mkdir /data/media 0770 media_rw media_rw - chown media_rw media_rw /data/media - - # Create directory for tftp - mkdir /data/vendor/tombstones 0771 system system - mkdir /data/vendor/tombstones/rfs 0771 system system - - mkdir /data/misc/bluetooth 0770 bluetooth bluetooth - - # Create the directories used by the Wireless subsystem - mkdir /data/misc/wifi 0770 wifi wifi - mkdir /data/misc/wifi/sockets 0770 wifi wifi - mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi - mkdir /data/misc/dhcp 0770 dhcp dhcp - chown dhcp dhcp /data/misc/dhcp - - # Create port-bridge log dir - mkdir /data/misc/port_bridge 0770 radio radio - chmod 0770 /data/misc/port_bridge - - # Create netmgr log dir - mkdir /data/vendor/netmgr 0770 radio radio - chmod 0770 /data/vendor/netmgr - - # Create ipacm log dir - mkdir /data/vendor/ipa 0770 radio radio - chmod 0770 /data/vendor/ipa - - # Create the directories used by CnE subsystem - mkdir /data/connectivity 0771 system system - chown system system /data/connectivity - - # Create directory used by audio subsystem - mkdir /data/vendor/misc/audio 0770 audio audio - - # Create directory for audio delta files - mkdir /data/vendor/misc/audio/acdbdata 0770 media audio - mkdir /data/vendor/misc/audio/acdbdata/delta 0770 media audio - - # Create directory for radio - mkdir /data/vendor/radio 0770 system radio - - chmod 0664 /sys/devices/platform/msm_sdcc.1/polling - chmod 0664 /sys/devices/platform/msm_sdcc.2/polling - chmod 0664 /sys/devices/platform/msm_sdcc.3/polling - chmod 0664 /sys/devices/platform/msm_sdcc.4/polling - - # Chown polling nodes as needed from UI running on system server - chown system system /sys/devices/platform/msm_sdcc.1/polling - chown system system /sys/devices/platform/msm_sdcc.2/polling - chown system system /sys/devices/platform/msm_sdcc.3/polling - chown system system /sys/devices/platform/msm_sdcc.4/polling - - # Create directories for Location services - mkdir /data/vendor/location 0770 gps gps - mkdir /data/vendor/location/mq 0770 gps gps - mkdir /data/vendor/location/xtwifi 0770 gps gps - - # Create /data/time folder for time-services - mkdir /data/time/ 0700 system system - mkdir /data/audio/ 0770 media audio - - # Create a folder for audio delta files - mkdir /data/audio/acdbdata 0770 media audio - mkdir /data/audio/acdbdata/delta 0770 media audio - setprop vold.post_fs_data_done 1 - - # Create a folder for SRS to be able to create a usercfg file - mkdir /data/data/media 0770 media media - - # Create FM dir for patchdownloader - mkdir /data/misc/fm 0770 system system - chmod 0770 /data/misc/fm - - #Create PERFD deamon related dirs - mkdir /data/vendor/perfd 0770 root system - chmod 2770 /data/vendor/perfd - rm /data/vendor/perfd/default_values - - # NFC local data and nfcee xml storage - mkdir /data/nfc 0770 nfc nfc - mkdir /data/nfc/param 0770 nfc nfc - - #Create IOP deamon related dirs - mkdir /data/vendor/iop 0770 root system - - # Mark the copy complete flag to not completed - write /data/vendor/radio/copy_complete 0 - chown radio radio /data/vendor/radio/copy_complete - chmod 0660 /data/vendor/radio/copy_complete - - # copy prebuilt qcril.db files always - copy /vendor/radio/qcril_database/qcril.db /data/vendor/radio/qcril_prebuilt.db - chown radio radio /data/vendor/radio/qcril_prebuilt.db - chmod 0660 /data/vendor/radio/qcril_prebuilt.db - - # File flags for prebuilt ril db file - write /data/vendor/radio/prebuilt_db_support 1 - chown radio radio /data/vendor/radio/prebuilt_db_support - chmod 0400 /data/vendor/radio/prebuilt_db_support - write /data/vendor/radio/db_check_done 0 - chown radio radio /data/vendor/radio/db_check_done - chmod 0660 /data/vendor/radio/db_check_done - # start camera server as daemon service qcamerasvr /vendor/bin/mm-qcamera-daemon class main -- cgit v1.2.3 From 1d3f76791250c420724ec625e56c02a9b97bba9e Mon Sep 17 00:00:00 2001 From: Gurpreet Ghai Date: Thu, 18 May 2017 20:56:00 +0530 Subject: msm8996-common: Create folder for Bluetooth logs/dump collection These changes are to create folder to collect logs and dump from Bluetooth HAL daemon. CRs-Fixed: 2051034 Change-Id: Ib930a80aab1354ad1463a02febf71eba922e2df8 --- rootdir/etc/init.qcom.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 44beffc..3150543 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -104,7 +104,10 @@ on post-fs-data mkdir /data/vendor/tombstones 0771 system system mkdir /data/vendor/tombstones/rfs 0771 system system + mkdir /data/vendor/ramdump 0771 root system mkdir /data/misc/bluetooth 0770 bluetooth bluetooth + mkdir /data/vendor/bluetooth 0770 bluetooth bluetooth + mkdir /data/vendor/ramdump/bluetooth 0770 bluetooth bluetooth # Create the directories used by the Wireless subsystem mkdir /data/misc/wifi 0770 wifi wifi -- cgit v1.2.3 From 21978cf2c1e33336c8e4b8d6d55dc833bd10be87 Mon Sep 17 00:00:00 2001 From: RAJATH R Date: Tue, 19 Sep 2017 11:09:37 +0530 Subject: msm8996-common: Removing redundant permission for BT folder Removing redundant creation and assignment of permission for data/misc/bluetooth folder from init.qcom.rc file. Change-Id: I941a53d01675b44fa6a5b59bcd2b72f9e6a11ab7 --- rootdir/etc/init.qcom.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 3150543..2fae40e 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -105,7 +105,6 @@ on post-fs-data mkdir /data/vendor/tombstones/rfs 0771 system system mkdir /data/vendor/ramdump 0771 root system - mkdir /data/misc/bluetooth 0770 bluetooth bluetooth mkdir /data/vendor/bluetooth 0770 bluetooth bluetooth mkdir /data/vendor/ramdump/bluetooth 0770 bluetooth bluetooth -- cgit v1.2.3 From 3a50f5c9f117b983c35b6d1975e9b9488132e07d Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Thu, 1 Feb 2018 19:07:26 +0100 Subject: msm8996-common: rootdir: Move sensors permissions handling to 'post-fs-data' * We need to set proper permissions earlier otherwise users might be forced to reboot as their sensors wouldn't work due to not working sensors daemon. Change-Id: Idbb5dd8a539a85c9b498e70b158569a2c9f37682 --- rootdir/etc/init.qcom.rc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 2fae40e..92a0d0b 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -157,6 +157,18 @@ on post-fs-data mkdir /data/vendor/location/mq 0770 gps gps mkdir /data/vendor/location/xtwifi 0770 gps gps + # SSC/SLPI sensors + mkdir /persist/sensors 0775 root system + chown root system /persist/sensors/sensors_settings + chmod 0664 /persist/sensors/sensors_settings + chown root system /persist/sensors/sns.reg + chmod 0664 /persist/sensors/sns.reg + + # /dev/sensors only supports an ioctl to get the current SLPI timestamp; + # allow the sensors daemon to perform this as non-root + chown root system /dev/sensors + chmod 0660 /dev/sensors + # Create /data/time folder for time-services mkdir /data/time/ 0700 system system mkdir /data/audio/ 0770 media audio -- cgit v1.2.3 From 50ef3ca5113e38529cf5f3940a9b2121670cf75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 25 Feb 2018 21:53:57 +0100 Subject: msm8996-common:: rootdir: Remove unneeded init.qcom.sensors.sh. --- rootdir/Android.mk | 8 -------- rootdir/etc/init.qcom.rc | 5 ----- rootdir/etc/init.qcom.sensors.sh | 43 ---------------------------------------- 3 files changed, 56 deletions(-) delete mode 100755 rootdir/etc/init.qcom.sensors.sh diff --git a/rootdir/Android.mk b/rootdir/Android.mk index bc0e71a..6c3df51 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -62,14 +62,6 @@ LOCAL_SRC_FILES := etc/ueventd.qcom.rc LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.qcom.sensors.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.qcom.sensors.sh -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES) -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := chargeonlymode LOCAL_MODULE_OWNER := zuk diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 92a0d0b..ca705e2 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -808,11 +808,6 @@ service loc_launcher /vendor/bin/loc_launcher group gps inet diag wifi writepid /dev/cpuset/system-background/tasks -service sensor-sh /vendor/bin/init.qcom.sensors.sh - class core - user root - oneshot - service atfwd /system/bin/ATFWD-daemon class late_start user system diff --git a/rootdir/etc/init.qcom.sensors.sh b/rootdir/etc/init.qcom.sensors.sh deleted file mode 100755 index fd193e2..0000000 --- a/rootdir/etc/init.qcom.sensors.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/vendor/bin/sh -# Copyright (c) 2015, 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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. -# - -# -# Function to start sensors for SSC enabled platforms -# -start_sensors() -{ - if [ -c /dev/msm_dsps -o -c /dev/sensors ]; then - chmod -h 775 /persist/sensors - chmod -h 664 /persist/sensors/sensors_settings - mkdir -p /persist/sensors/registry/registry - chown -h system.root /persist/sensors/sensors_settings - start sensors - fi -} - -start_sensors -- cgit v1.2.3 From 8184e6b76a894b7de3899b730f4d85aeb4e9eb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 26 Feb 2018 22:19:13 +0100 Subject: msm8996-common: Remove duplicated definition of service 'hci_filter_root' --- rootdir/etc/init.qcom.rc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index ca705e2..f413864 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -697,18 +697,6 @@ on property:wc_transport.start_root=true on property:wc_transport.start_root=false stop hci_filter_root -service hci_filter_root /vendor/bin/wcnss_filter - class late_start - user bluetooth - group bluetooth diag system - disabled - -on property:wc_transport.start_root=true - start hci_filter_root - -on property:wc_transport.start_root=false - stop hci_filter_root - service hci_filter_root /vendor/bin/wcnss_filter class late_start user bluetooth -- cgit v1.2.3 From 79b6a199c986e91a16e339eecfc396d72e9dc6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 26 Feb 2018 22:30:30 +0100 Subject: msm8996-common: Remove wfdservice. * Qualcomm Wifi Direct, as far as I know, but we dont ship its blob. --- rootdir/etc/init.qcom.rc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index f413864..75a1125 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -818,13 +818,6 @@ service msm_irqbalance /vendor/bin/msm_irqbalance -f /vendor/etc/msm_irqbalance. disabled writepid /dev/cpuset/system-background/tasks -service wfdservice /system/bin/wfdservice - class main - user system - group audio camera inet net_bt_stack drmrpc media_rw media input net_admin - # removed these because of limit of 12 groups - #graphics net_bt net_bt_admin bluetooth - # Seemp health service service seemp_healthd /vendor/bin/seemp_healthd class late_start -- cgit v1.2.3 From 9ee266b7f33020597966942e2c268ec67c53a7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 26 Feb 2018 22:39:57 +0100 Subject: msm8996-common: Remove imports of missing rc files. * There is no init.target.rc or init.zuk.usb.rc --- rootdir/etc/init.qcom.rc | 2 +- rootdir/etc/init.qcom.usb.rc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 75a1125..c716cc8 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -24,9 +24,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # + import /vendor/etc/init/hw/init.qcom.power.rc import /vendor/etc/init/hw/init.qcom.usb.rc -import /vendor/etc/init/hw/init.target.rc on early-init mount debugfs debugfs /sys/kernel/debug diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc index 63a8886..e4a3535 100644 --- a/rootdir/etc/init.qcom.usb.rc +++ b/rootdir/etc/init.qcom.usb.rc @@ -25,8 +25,6 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -import /vendor/etc/init/hw/init.zuk.usb.rc - on init write /sys/class/android_usb/android0/f_rndis/wceis 1 write /sys/class/android_usb/android0/iSerial ${ro.serialno} -- cgit v1.2.3 From fa2a19958bd920fce62d6aef12b5aa6cf20cde1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 26 Feb 2018 22:45:30 +0100 Subject: msm8996-common: rootdir: Remove unneeded dirs. * This fixes these SELinux denials and it doesn't break anything for now... :-P avc: denied { create } for pid=1 comm=init name=firmware scontext=u:r:init:s0 tcontext=u:object_r:firmware_file:s0 tclass=dir permissive=0 avc: denied { create } for pid=1 comm=init name=bt_firmware scontext=u:r:init:s0 tcontext=u:object_r:bt_firmware_file:s0 tclass=dir permissive=0 --- rootdir/etc/init.qcom.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index c716cc8..ec3a89a 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -34,10 +34,7 @@ on early-init chown root system /dev/kmsg chmod 0620 /dev/kmsg - mkdir /firmware 0771 system system - mkdir /bt_firmware 0771 system system symlink /data/tombstones /tombstones - mkdir /dsp 0771 media media # ZRAM setup write /sys/block/zram0/comp_algorithm lz4 -- cgit v1.2.3 From ce7239c3e669e12e0bb920b9eb1d425855df839b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 26 Feb 2018 23:12:59 +0100 Subject: msm8996-common: rootdir: Remove seempd * Disable on the kernel and we don't ship its blob. --- rootdir/etc/init.qcom.rc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index ec3a89a..68e3b66 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -450,12 +450,6 @@ service qseecomd /vendor/bin/qseecomd group root writepid /dev/cpuset/system-background/tasks -service seempd /system/bin/seempd - class late_start - user system - group system - socket seempdw dgram 0666 system system - service secotad /system/bin/secotad class late_start user system -- cgit v1.2.3 From eadf00baad689fa6ac5237b5f98af0f4f6e943fe Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 1 Jan 2018 15:04:23 +0100 Subject: msm8996-common: rootdir: Remove audiod service * Dropped by Qualcomm in O. Change-Id: Id1c6e9d475b59b41c0cc4e4633e2ce7faabd19ef --- rootdir/etc/init.qcom.rc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 68e3b66..bc9c33c 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -475,11 +475,6 @@ service adsprpcd /vendor/bin/adsprpcd user media group media -service audiod /system/bin/audiod - class late_start - user system - group system - service imsqmidaemon /vendor/bin/imsqmidaemon class main user system -- cgit v1.2.3 From 35d7e9263a179b6c0e3ee9c5fb0cdcb620572167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Mon, 26 Feb 2018 23:50:58 +0100 Subject: msm8996-common: proprietary-files.txt: Clean up firmware files. --- proprietary-files.txt | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index ee254f0..8a26154 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -66,10 +66,6 @@ vendor/bin/wcnss_filter vendor/lib64/libbtnv.so vendor/lib/libbtnv.so -# Bluetooth firmware -etc/bluetooth/btfw32.tlv -etc/bluetooth/btnv32.bin - # Camera lib/libtrueportrait.so vendor/bin/mm-qcamera-daemon @@ -419,31 +415,12 @@ vendor/lib/hw/vulkan.msm8996.so vendor/lib64/hw/vulkan.msm8996.so # Graphics firmware -vendor/firmware/a225_pfp.fw -vendor/firmware/a225_pm4.fw -vendor/firmware/a225p5_pm4.fw -vendor/firmware/a300_pfp.fw -vendor/firmware/a300_pm4.fw -vendor/firmware/a330_pfp.fw -vendor/firmware/a330_pm4.fw -vendor/firmware/a420_pfp.fw -vendor/firmware/a420_pm4.fw -vendor/firmware/a530_gpmu.fw2 vendor/firmware/a530_pfp.fw vendor/firmware/a530_pm4.fw -vendor/firmware/a530_zap.b00 -vendor/firmware/a530_zap.b01 vendor/firmware/a530_zap.b02 -vendor/firmware/a530_zap.elf vendor/firmware/a530_zap.mdt -vendor/firmware/a540_gpmu.fw2 -vendor/firmware/a530v1_pfp.fw -vendor/firmware/a530v1_pm4.fw -vendor/firmware/a530v2_seq.fw2 vendor/firmware/a530v3_gpmu.fw2 vendor/firmware/a530v3_seq.fw2 -vendor/firmware/leia_pfp_470.fw -vendor/firmware/leia_pm4_470.fw # IMS -app/ims/ims.apk -- cgit v1.2.3 From 6fc1c18c75286047a3d4bc434ca20ccc729c4163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Tue, 27 Feb 2018 21:38:25 +0100 Subject: msm8996-common: Fix SELinux denial: * avc: denied { write } for pid=520 comm=vendor.qti.hard name=property_service dev=tmpfs ino=14296 scontext=u:r:hal_perf_default:s0 tcontext=u:object_r:property_socket:s0 tclass=sock_file permissive=0. --- sepolicy/hal_perf_default.te | 1 + 1 file changed, 1 insertion(+) create mode 100644 sepolicy/hal_perf_default.te diff --git a/sepolicy/hal_perf_default.te b/sepolicy/hal_perf_default.te new file mode 100644 index 0000000..9629604 --- /dev/null +++ b/sepolicy/hal_perf_default.te @@ -0,0 +1 @@ +allow hal_perf_default property_socket:sock_file write; -- cgit v1.2.3 From d8b10bdbba1277867cde0b43eb77b258de7bc84c Mon Sep 17 00:00:00 2001 From: Bruce Levy Date: Wed, 2 Aug 2017 15:21:07 -0700 Subject: msm8996-common: Mark rmt_storage as shutdown critical rmt_storage should not be automatically killed by Android during shutdown since it is needed to actually process the peripheral shutdown Change-Id: I58a29fe86955f0abad944727bb4208dad89f495d --- rootdir/etc/init.qcom.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index bc9c33c..fb17836 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -657,6 +657,7 @@ service rmt_storage /vendor/bin/rmt_storage class core user root group root system wakelock + shutdown critical writepid /dev/cpuset/system-background/tasks service tftp_server /vendor/bin/tftp_server -- cgit v1.2.3 From 1839e7c05023b5ee89386cb308d018786e18a9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Tue, 27 Feb 2018 22:16:36 +0100 Subject: msm8996-common: Import ueventd.qcom.rc from ZUI 3.5.261. --- rootdir/etc/ueventd.qcom.rc | 73 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc index bdff059..d48ee2c 100644 --- a/rootdir/etc/ueventd.qcom.rc +++ b/rootdir/etc/ueventd.qcom.rc @@ -1,4 +1,4 @@ -# Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. +# Copyright (c) 2012-2015, 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: @@ -29,12 +29,13 @@ /dev/diag 0660 system oem_2901 /dev/genlock 0666 system system +/dev/wlan 0660 wifi wifi /dev/kgsl 0666 system system /dev/kgsl-3d0 0666 system system /dev/kgsl-2d0 0666 root root /dev/kgsl-2d1 0666 root root /dev/ion 0664 system system -/dev/rtc0 0600 system system +/dev/rtc0 0660 system system /dev/smd0 0660 system system /dev/smd4 0660 system system /dev/smd_cxm_qmi 0640 radio radio @@ -51,6 +52,11 @@ #permissions for CSVT /dev/smd11 0660 radio radio +#permsissions for BT/FM +/dev/smd2 0660 bluetooth bluetooth +/dev/smd3 0660 bluetooth bluetooth +/dev/btpower 0660 bluetooth system + #permissions for pta /dev/pta 0660 system system @@ -106,12 +112,21 @@ /dev/mhi_pipe_14 0640 radio radio /dev/mhi_pipe_16 0640 radio radio /dev/mhi_pipe_32 0640 radio radio +/dev/at_usb0 0640 radio radio +/dev/at_mdm0 0640 radio radio /dev/video* 0660 system camera /dev/media* 0660 system camera /dev/v4l-subdev* 0660 system camera /dev/qseecom 0660 system drmrpc +/dev/smcinvoke 0660 system system +/dev/qsee_ipc_irq_spss 0660 system drmrpc /dev/seemplog 0660 system system /dev/pft 0660 system drmrpc +/dev/spcom 0660 system system +/dev/sp_kernel 0660 system system +/dev/sp_ssr 0660 system system +/dev/sp_keymaster 0660 system system +/dev/cryptoapp 0660 system system /dev/gemini0 0660 system camera /dev/jpeg0 0660 system camera /dev/jpeg1 0660 system camera @@ -120,6 +135,12 @@ /dev/adsprpc-smd 0664 system system /dev/system_health_monitor 0644 radio system /dev/mdss_rotator 0664 system system +# wlan +/dev/wcnss_wlan 0660 system system +/dev/wcnss_ctrl 0660 system system +/sys/devices/soc/a000000.qcom,wcnss-wlan/net/wlan0/queues/rx-* rps_cpus 0660 system system +/sys/devices/soc/a000000.qcom,wcnss-wlan/net/p2p0/queues/rx-* rps_cpus 0660 system system +/dev/spidev0.0 0660 system audio /dev/msm_camera/* 0660 system camera /dev/gemini/ 0660 system camera /dev/mercury0 0660 system camera @@ -129,8 +150,11 @@ /dev/msm_vidc_enc 0660 system audio /dev/msm_rotator 0660 system system /dev/hw_random 0600 root root +/dev/sdsprpc-smd 0660 system system #permissions for audio +/dev/wcd_dsp0_control 0660 system audio +/dev/wcd-dsp-glink 0660 system audio /dev/audio_slimslave 0660 system audio /dev/msm_qcelp 0660 system audio /dev/msm_evrc 0660 system audio @@ -146,7 +170,8 @@ /dev/msm_aac_in 0660 system audio /dev/msm_qcelp_in 0660 system audio /dev/msm_evrc_in 0660 system audio -/dev/msm_amrnb_in 0640 system audio +/dev/msm_amrnb_in 0660 system audio +/dev/msm_amrwb_in 0660 system audio /dev/msm_a2dp_in 0660 system audio /dev/msm_ac3 0660 system audio /dev/msm_audio_cal 0660 system audio @@ -158,8 +183,6 @@ /dev/msm_preproc_ctl 0660 system audio /dev/msm_rtac 0660 system audio /dev/msm_voicememo 0660 system audio -/dev/smd3 0660 bluetooth bluetooth -/dev/smd2 0660 bluetooth bluetooth /dev/ttyHSL1 0660 system system /dev/ttyHS1 0660 system system /dev/mdm 0660 system radio @@ -168,9 +191,12 @@ /dev/tty_sdio_00 0660 system system /dev/ttyGS0 0660 system system /dev/i2c-5 0660 media media -/dev/voice_svc 0660 system audio +/dev/input/event* 0660 system input /dev/avtimer 0660 system audio +# TFA9890 For SmartPA +/dev/tfa9890 0660 media media + # DVB devices /dev/dvb/adapter0/demux* 0440 media media /dev/dvb/adapter0/dvr* 0660 media media @@ -180,9 +206,6 @@ /dev/tsc_mux0 0660 media media /dev/tsc_ci0 0660 media media -# ultrasonic fingerprint -/sys/devices/soc/757a000.i2c/i2c-6/* eeprom 0440 system system - # sensors /sys/devices/i2c-12/12-* pollrate_ms 0664 system system /sys/devices/f9925000.i2c/i2c-0/0-* enable 0660 input system @@ -205,6 +228,21 @@ /sys/devices/virtual/optical_sensors/lightsensor ls_poll_delay 0660 input system /sys/devices/virtual/input/input* poll 0660 input system /sys/devices/virtual/input/input* pollrate_ms 0660 input system +/sys/devices/virtual/input/input* enable 0660 system input +/sys/devices/virtual/input/input* poll_delay 0660 system input +/sys/devices/soc/78b7000.i2c/i2c-3/3-0020/input/input* secure_touch 0440 system drmrpc +/sys/devices/soc/78b7000.i2c/i2c-3/3-0020/input/input* secure_touch_enable 0660 system drmrpc +/sys/devices/soc/78b7000.i2c/i2c-3/3-0038/input/input* secure_touch 0440 system drmrpc +/sys/devices/soc/78b7000.i2c/i2c-3/3-0038/input/input* secure_touch_enable 0660 system drmrpc +/sys/devices/soc/78b7000.i2c/i2c-3/3-004b/input/input* secure_touch 0440 system drmrpc +/sys/devices/soc/78b7000.i2c/i2c-3/3-004b/input/input* secure_touch_enable 0660 system drmrpc +/sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input* secure_touch 0440 system drmrpc +/sys/devices/soc/c179000.i2c/i2c-5/5-0020/input/input* secure_touch_enable 0660 system drmrpc + +# laser sensor access +/sys/devices/virtual/input/input* enable_ps_sensor 0660 system input +/sys/devices/virtual/input/input* set_delay_ms 0660 system input +/sys/devices/virtual/input/input* do_flush 0660 system input # vm_bms /dev/vm_bms 0660 system system @@ -216,6 +254,13 @@ /sys/devices/soc/600000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/wlan0/queues/rx-* rps_cpus 0660 system system /sys/devices/soc/600000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/p2p0/queues/rx-* rps_cpus 0660 system system +# wigig +/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/fst_link_loss 0660 wifi wifi +/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/thermal_throttling 0660 system system +/sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/queues/rx-0/rps_cpus 0660 system system +/sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/gro_flush_timeout 0660 system system +/sys/devices/virtual/net/bond0 queues/rx-0/rps_cpus 0660 system system + #nfc permissions /dev/nfc-nci 0660 nfc nfc /dev/nq-nci 0660 nfc nfc @@ -242,9 +287,13 @@ /dev/hbtp_input 0660 system system /dev/hbtp_vm 0660 system system -# TFA9890 FOR SMARTPA -/dev/tfa9890 0660 media media - # Add device block for FRP +/dev/block/platform/soc/7824900.sdhci/by-name/config 0600 system system /dev/block/platform/soc/7464900.sdhci/by-name/frp 0600 system system /dev/block/platform/soc/624000.ufshc/by-name/frp 0600 system system +/dev/block/platform/soc/1da4000.ufshc/by-name/frp 0600 system system +/dev/block/platform/soc/c0c4000.sdhci/by-name/frp 0600 system system +/dev/block/platform/soc/1d84000.ufshc/by-name/frp 0600 system system + +# Kmsg device +/dev/kmsg 0620 root system -- cgit v1.2.3 From a68befa55060b779e609bb659c5d9580f21ff3f4 Mon Sep 17 00:00:00 2001 From: Brian Duddie Date: Wed, 19 Jul 2017 12:47:14 -0700 Subject: msm8996-common: Run sensors daemon as system user instead of root Grant capabilities and change file permissions to allow the sensors.qcom daemon to start up as the system user/group, rather than running as root. Fixes: 63775281 Test: monitor logcat after reboot, confirm no file open errors. Run QSensorTest, confirm all sensors provide sane data. Confirm that IMU calibration can read + write its saved settings. Run sensors CTS. Change-Id: Ib80ea21900d6af6cd34c82c4a63f50c7e0ac18ff --- rootdir/etc/init.qcom.rc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index fb17836..6bb20c7 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -724,8 +724,11 @@ service qti /vendor/bin/qti service sensors /vendor/bin/sensors.qcom class core - user root - group root wakelock + user system + group system + # Grants the ability for this daemon to bind IPC router ports so it can + # register QMI services + capabilities NET_BIND_SERVICE writepid /dev/cpuset/system-background/tasks on property:ro.use_data_netmgrd=false -- cgit v1.2.3 From 0e90fc10d51030cb63189947b1c205bbb27e7cea Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Fri, 21 Jul 2017 11:47:15 +0530 Subject: msm8996-common: Set ioprio for rmt_storage service Earlier, this used to be set from rmt_storage service with sys_admin capability. But now, that capability is dropped off and hence, set it here in init scripts. Change-Id: Ie8a3895c2b63da35d78fb9e571d74b735c969520 --- rootdir/etc/init.qcom.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 6bb20c7..93b53b2 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -658,6 +658,7 @@ service rmt_storage /vendor/bin/rmt_storage user root group root system wakelock shutdown critical + ioprio rt 0 writepid /dev/cpuset/system-background/tasks service tftp_server /vendor/bin/tftp_server -- cgit v1.2.3 From bd5dbfb9fe13df2957874e25aee164d61788dc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Tue, 27 Feb 2018 22:34:42 +0100 Subject: msm8996-common: rootdir: Move qcamerasvr from main to late_start. --- rootdir/etc/init.qcom.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 93b53b2..b085164 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -414,7 +414,7 @@ on boot # start camera server as daemon service qcamerasvr /vendor/bin/mm-qcamera-daemon - class main + class late_start user camera group camera system inet input graphics writepid /dev/cpuset/system-background/tasks -- cgit v1.2.3 From 462cea21b55d664313df9f20c133dd47629bf8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Tue, 27 Feb 2018 23:36:43 +0100 Subject: msm8996-common: More SELinux denials: * avc: denied { connectto } for pid=537 comm=vendor.qti.hard path=/dev/socket/property_service scontext=u:r:hal_perf_default:s0 tcontext=u:r:init:s0 tclass=unix_stream_socket permissive=0 * avc: denied { set } for property=ro.min_freq_0 pid=536 uid=0 gid=0 scontext=u:r:hal_perf_default:s0 tcontext=u:object_r:freq_prop:s0 tclass=property_service permissive=0 --- sepolicy/hal_perf_default.te | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sepolicy/hal_perf_default.te b/sepolicy/hal_perf_default.te index 9629604..434ac35 100644 --- a/sepolicy/hal_perf_default.te +++ b/sepolicy/hal_perf_default.te @@ -1 +1,3 @@ allow hal_perf_default property_socket:sock_file write; +allow hal_perf_default init:unix_stream_socket connectto; +allow hal_perf_default freq_prop:property_service set; -- cgit v1.2.3 From 113624db317f5272eca0e85e858a11d2aa16c61d Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Thu, 22 Jun 2017 19:20:26 -0700 Subject: msm8996-common: Media volume: from 15 to 25 steps Test: play media, use all 25 vol steps and observe varying attenuation Bug: 32195657 Change-Id: I7ac87df0b2b15de3a7bb87e739bd88ef7b185236 --- vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor.prop b/vendor.prop index 4e62e35..e4ba54d 100644 --- a/vendor.prop +++ b/vendor.prop @@ -20,6 +20,7 @@ ro.vendor.audio.sdk.fluencetype=fluence ro.vendor.audio.sdk.ssr=false vendor.audio.tunnel.encode=false vendor.voice.path.for.pcm.voip=true +ro.config.media_vol_steps=25 # Bluetooth bt.max.hfpclient.connections=1 -- cgit v1.2.3 From 8b11e4e99ec6375dc4135a56d45f0e092ea9515e Mon Sep 17 00:00:00 2001 From: rago Date: Fri, 1 Jul 2016 16:05:00 -0700 Subject: msm8996-common: Set voice call volume steps to 7 Bug: 28426597 Change-Id: Icf78d9acec75c500982b1e4391af4d6f3933da37 --- vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor.prop b/vendor.prop index e4ba54d..79852a4 100644 --- a/vendor.prop +++ b/vendor.prop @@ -21,6 +21,7 @@ ro.vendor.audio.sdk.ssr=false vendor.audio.tunnel.encode=false vendor.voice.path.for.pcm.voip=true ro.config.media_vol_steps=25 +ro.config.vc_call_vol_steps=7 # Bluetooth bt.max.hfpclient.connections=1 -- cgit v1.2.3 From c6d0ed0c3844775b1bec91efae1ba06100ec5748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Wed, 28 Feb 2018 22:59:59 +0100 Subject: msm8996-common: Pin mm-qcamera-daemon * It seems that ZUI changed its kernel and/or HAL, so pin the last known mm-qcamera-daemon that works with our source code. * Thanks to @davidevinavil --- proprietary-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 8a26154..2528c3d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -68,7 +68,7 @@ vendor/lib/libbtnv.so # Camera lib/libtrueportrait.so -vendor/bin/mm-qcamera-daemon +vendor/bin/mm-qcamera-daemon|0ffe963b560222f52e65084cd9de455656a7bc11 vendor/lib/libarcsoft_beautyshot.so vendor/lib/libchromaflash.so vendor/lib/libflash_pmic.so -- cgit v1.2.3 From a9fedd62985c8e2c770fd160219156683838610a Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Tue, 10 May 2016 15:38:22 -0500 Subject: msm8996-common: Turn down debugging on wpa_supplicant/hostapd --- rootdir/etc/init.qcom.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index b085164..a3cdad0 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -749,7 +749,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ -I/system/vendor/etc/wifi/p2p_supplicant_overlay.conf -N \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -I/system/vendor/etc/wifi/wpa_supplicant_overlay.conf \ - -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 -dd \ + -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 \ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT -- cgit v1.2.3 From e96efd99be1416ba3cdd02fcd9e15f5241fe3216 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 24 Dec 2017 02:29:51 +0000 Subject: msm8996-common: Move Wi-Fi files to vendor Change-Id: I7e95baa01490ec76cf8ddfa051f01fc9b0bc5c7a --- rootdir/etc/init.qcom.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index a3cdad0..a2c3f44 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -746,9 +746,9 @@ on property:sys.sysctl.tcp_adv_win_scale=* service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ - -I/system/vendor/etc/wifi/p2p_supplicant_overlay.conf -N \ + -I/vendor/etc/wifi/p2p_supplicant_overlay.conf -N \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ - -I/system/vendor/etc/wifi/wpa_supplicant_overlay.conf \ + -I/vendor/etc/wifi/wpa_supplicant_overlay.conf \ -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 \ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi -- cgit v1.2.3 From 20ba28f2df0f5fd07c5691377d7ee6879e701b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 22:05:34 +0100 Subject: msm8996-common: Clean up unneeded/unused services. * We don't ship blobs for them. --- rootdir/etc/init.qcom.rc | 49 ------------------------------------------------ 1 file changed, 49 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index a2c3f44..77e14be 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -419,11 +419,6 @@ service qcamerasvr /vendor/bin/mm-qcamera-daemon group camera system inet input graphics writepid /dev/cpuset/system-background/tasks -service qvop-daemon /system/bin/qvop-daemon - class late_start - user system - group system drmrpc - # start up peripheral manager service per_mgr /vendor/bin/pm-service class late_start @@ -450,11 +445,6 @@ service qseecomd /vendor/bin/qseecomd group root writepid /dev/cpuset/system-background/tasks -service secotad /system/bin/secotad - class late_start - user system - group system - service thermal-engine /vendor/bin/thermal-engine class main user root @@ -520,12 +510,6 @@ on property:vendor.ims.DATA_DAEMON_STATUS=1 start ims_rtp_daemon start vendor.imsrcsservice -service dts_configurator /system/bin/dts_configurator - class late_start - user system - group system media audio - oneshot - service ppd /vendor/bin/mm-pp-dpps class late_start user system @@ -551,12 +535,6 @@ on property:init.svc.zygote=running on property:init.svc.zygote=restarting stop ppd -service tlocd /system/bin/tloc_daemon - class late_start - user system - group drmrpc gps net_raw - seclabel u:r:tlocd:s0 - service readmac /vendor/bin/readmac class main user root @@ -569,16 +547,6 @@ service energy-awareness /vendor/bin/energy-awareness group system oneshot -service mdtpd /vendor/bin/mdtpd - class late_start - user root - group system radio drmrpc - -service qcomsysd /system/bin/qcom-system-daemon - class main - user root - group root diag - on property:sys.boot_completed=1 write /dev/kmsg "Boot completed " @@ -760,12 +728,6 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ disabled oneshot -service ptt_socket_app /system/bin/ptt_socket_app -d - class main - user root - group root - oneshot - service wifi_fccutild /system/bin/wifi_fccutild user system group system inet net_admin @@ -787,11 +749,6 @@ service loc_launcher /vendor/bin/loc_launcher group gps inet diag wifi writepid /dev/cpuset/system-background/tasks -service atfwd /system/bin/ATFWD-daemon - class late_start - user system - group system radio - on property:ro.data.large_tcp_window_size=true # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) write /proc/sys/net/ipv4/tcp_adv_win_scale 2 @@ -809,12 +766,6 @@ service msm_irqbalance /vendor/bin/msm_irqbalance -f /vendor/etc/msm_irqbalance. disabled writepid /dev/cpuset/system-background/tasks -# Seemp health service -service seemp_healthd /vendor/bin/seemp_healthd - class late_start - user system - group system - on charger setprop persist.sys.usb.config charging -- cgit v1.2.3 From 8b6e07b0d8f9ee71a4672cc94a3d607b42ad02fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 22:35:14 +0100 Subject: msm8996-common: Don't build camera HAL test code. --- camera/QCamera2/stack/Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/camera/QCamera2/stack/Android.mk b/camera/QCamera2/stack/Android.mk index a357417..bd1c3e6 100644 --- a/camera/QCamera2/stack/Android.mk +++ b/camera/QCamera2/stack/Android.mk @@ -1,5 +1,3 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/mm-camera-interface/Android.mk include $(LOCAL_PATH)/mm-jpeg-interface/Android.mk -include $(LOCAL_PATH)/mm-jpeg-interface/test/Android.mk -include $(LOCAL_PATH)/mm-camera-test/Android.mk -- cgit v1.2.3 From 6c5653fa385292ff54c8d70ac902af04d972c72b Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 15 Aug 2016 12:18:43 +0200 Subject: msm8996-common: Add script to update sha1sums of kanged blobs Change-Id: Id2e8cfb8d3b6f65f69c91a89bacd615fdcc45753 --- update-sha1sums.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100755 update-sha1sums.py diff --git a/update-sha1sums.py b/update-sha1sums.py new file mode 100755 index 0000000..8d8e4bf --- /dev/null +++ b/update-sha1sums.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# +# Copyright (C) 2016 The CyanogenMod Project +# Copyright (C) 2017 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. +# + +from hashlib import sha1 + +device='gemini' +vendor='xiaomi' + +lines = [ line for line in open('proprietary-files.txt', 'r') ] +vendorPath = '../../../vendor/' + vendor + '/' + device + '/proprietary' +needSHA1 = False + +for index, line in enumerate(lines): + # Remove '\n' character + line = line[:-1] + + # Skip empty lines + if len(line) == 0: + continue + + # Check if we need to set SHA1 hash for the next files + if line[0] == '#': + needSHA1 = (' - from' in line) + continue + + if needSHA1: + # Remove existing SHA1 hash + line = line.split('|')[0] + + if line[0] == '-': + file = open('%s/%s' % (vendorPath, line[1:]), 'rb').read() + else: + file = open('%s/%s' % (vendorPath, line), 'rb').read() + + hash = sha1(file).hexdigest() + lines[index] = '%s|%s\n' % (line, hash) + +with open('proprietary-files.txt', 'w') as file: + for line in lines: + file.write(line) + + file.close() -- cgit v1.2.3 From 22b9c4d045d0623e82fa2ddd7139616b785b14a9 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 9 Jan 2018 00:59:02 +0100 Subject: msm8996-common: Handle moved blobs in update-sha1sums.py script Change-Id: Iccab8c8620c7ff680768aac2d9cbf5b5067af8d7 --- update-sha1sums.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/update-sha1sums.py b/update-sha1sums.py index 8d8e4bf..cbbb587 100755 --- a/update-sha1sums.py +++ b/update-sha1sums.py @@ -41,11 +41,12 @@ for index, line in enumerate(lines): if needSHA1: # Remove existing SHA1 hash line = line.split('|')[0] + filePath = line.split(':')[1] if len(line.split(':')) == 2 else line - if line[0] == '-': - file = open('%s/%s' % (vendorPath, line[1:]), 'rb').read() + if filePath[0] == '-': + file = open('%s/%s' % (vendorPath, filePath[1:]), 'rb').read() else: - file = open('%s/%s' % (vendorPath, line), 'rb').read() + file = open('%s/%s' % (vendorPath, filePath), 'rb').read() hash = sha1(file).hexdigest() lines[index] = '%s|%s\n' % (line, hash) -- cgit v1.2.3 From 00275e039fe33b6b17294b50fd5d3e1e169e13dd Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 15 Feb 2018 16:28:43 +0000 Subject: msm8996-common: Add unpinning support to update-sha1sums.py script Change-Id: I9035b449cea6d78927a459dc247075b3d4512e46 --- update-sha1sums.py | 55 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/update-sha1sums.py b/update-sha1sums.py index cbbb587..02a263c 100755 --- a/update-sha1sums.py +++ b/update-sha1sums.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # # Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017 The LineageOS Project +# Copyright (C) 2017-2018 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. @@ -17,6 +17,7 @@ # from hashlib import sha1 +import sys device='gemini' vendor='xiaomi' @@ -25,34 +26,54 @@ lines = [ line for line in open('proprietary-files.txt', 'r') ] vendorPath = '../../../vendor/' + vendor + '/' + device + '/proprietary' needSHA1 = False -for index, line in enumerate(lines): +def cleanup(): + for index, line in enumerate(lines): + # Remove '\n' character + line = line[:-1] + + # Skip empty or commented lines + if len(line) == 0 or line[0] == '#': + continue + + # Drop SHA1 hash, if existing + if '|' in line: + line = line.split('|')[0] + lines[index] = '%s\n' % (line) + +def update(): + for index, line in enumerate(lines): # Remove '\n' character line = line[:-1] # Skip empty lines if len(line) == 0: - continue + continue # Check if we need to set SHA1 hash for the next files if line[0] == '#': - needSHA1 = (' - from' in line) - continue + needSHA1 = (' - from' in line) + continue if needSHA1: - # Remove existing SHA1 hash - line = line.split('|')[0] - filePath = line.split(':')[1] if len(line.split(':')) == 2 else line + # Remove existing SHA1 hash + line = line.split('|')[0] + filePath = line.split(':')[1] if len(line.split(':')) == 2 else line + + if filePath[0] == '-': + file = open('%s/%s' % (vendorPath, filePath[1:]), 'rb').read() + else: + file = open('%s/%s' % (vendorPath, filePath), 'rb').read() - if filePath[0] == '-': - file = open('%s/%s' % (vendorPath, filePath[1:]), 'rb').read() - else: - file = open('%s/%s' % (vendorPath, filePath), 'rb').read() + hash = sha1(file).hexdigest() + lines[index] = '%s|%s\n' % (line, hash) - hash = sha1(file).hexdigest() - lines[index] = '%s|%s\n' % (line, hash) +if len(sys.argv) == 2 and sys.argv[1] == '-c': + cleanup() +else: + update() with open('proprietary-files.txt', 'w') as file: - for line in lines: - file.write(line) + for line in lines: + file.write(line) - file.close() + file.close() -- cgit v1.2.3 From 224e68eecb66b580dff9759c7eca7acd68dfcec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 23:36:02 +0100 Subject: msm8996-common: Set zuk and msm8996-common in update-sha1sums.py --- update-sha1sums.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update-sha1sums.py b/update-sha1sums.py index 02a263c..2595d21 100755 --- a/update-sha1sums.py +++ b/update-sha1sums.py @@ -19,8 +19,8 @@ from hashlib import sha1 import sys -device='gemini' -vendor='xiaomi' +device='msm8996-common' +vendor='zuk' lines = [ line for line in open('proprietary-files.txt', 'r') ] vendorPath = '../../../vendor/' + vendor + '/' + device + '/proprietary' -- cgit v1.2.3 From 2dc1a7bc0c5a382adf9a2ae12b9fd38f21993348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Thu, 1 Mar 2018 23:34:08 +0100 Subject: msm8996-common: Use ext4 for system image. * It's the only fs allowed for system. --- BoardConfigCommon.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 63c5917..edbedfb 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -170,6 +170,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_USERDATAIMAGE_PARTITION_SIZE := 58132761600 BOARD_VENDORIMAGE_PARTITION_SIZE := 390029312 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -- cgit v1.2.3 From d1db139ac0bab3d0a9c47596d618cc16b4ae7a4c Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 27 Feb 2018 20:00:45 +0000 Subject: msm8996-common: Get rid of recovery-only fstab * Mounting /system and /vendor partitions is handled in kernel now, however removing the entries from fstab caused issues building the OTA. The workaround was to have a separate fstab, but turns out that simply setting the recoveryonly flag does the trick because those are then ignored during a normal Android boot. Change-Id: I2944384d0a1c41bc9f9f51e2e29daff2bed0a0f4 --- BoardConfigCommon.mk | 2 +- rootdir/etc/fstab.full | 24 ------------------------ rootdir/etc/fstab.qcom | 4 +++- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 rootdir/etc/fstab.full diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index edbedfb..113d6b5 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -184,7 +184,7 @@ BOARD_USES_QCOM_HARDWARE := true TARGET_HAS_NO_WIFI_STATS := true # Recovery -TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.full +TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true diff --git a/rootdir/etc/fstab.full b/rootdir/etc/fstab.full deleted file mode 100644 index 9b63c3d..0000000 --- a/rootdir/etc/fstab.full +++ /dev/null @@ -1,24 +0,0 @@ -# Android fstab file. -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - -#TODO: Add 'check' as fs_mgr_flags with data partition. -# Currently we dont have e2fsck compiled. So fs check would failed. - -# -/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/system /system ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait -/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer,quota -/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,quota -/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check -/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check -/dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait -/dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait -/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 -/dev/block/bootdevice/by-name/bluetooth /bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=222,fmask=333,context=u:object_r:bt_firmware_file:s0 wait -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=4 - -/devices/soc/6a00000.ssusb/6a00000.dwc3/xhci-hcd.0.auto/usb* auto auto defaults voldmanaged=usbdisk:auto diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index b1bc993..9133cbd 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -2,7 +2,7 @@ # The filesystem that contains the filesystem e2fsck binary (typically /system) cannot # specify 'check', and must come before any filesystems that do specify 'check' -# NOTE: /system and /vendor (/factory mounted as /vendor) partitions are now early-mounted and the fstab entry is specified in device tree: +# NOTE: /system and /vendor (/factory mounted as /vendor) partitions are now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only): # /proc/device-tree/firmware/android/fstab/system # /proc/device-tree/firmware/android/fstab/vendor @@ -11,6 +11,8 @@ /dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults /dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly +/dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait -- cgit v1.2.3 From 7a52bb207abe49c3931e2238b1da0cbcf2311146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Fri, 2 Mar 2018 00:05:08 +0100 Subject: msm8996-common: Try first with ext4. * ext4 is the stock's default choice. * f2fs support is highly dependent on which kernel you use. --- rootdir/etc/fstab.qcom | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 9133cbd..0785242 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -9,12 +9,12 @@ # /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/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer /dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer +/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime,inline_xattr,data_flush wait,check,encryptable=footer /dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly /dev/block/bootdevice/by-name/factory /vendor ext4 ro,barrier=1 wait,recoveryonly -/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check +/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check /dev/block/bootdevice/by-name/persist /persist ext4 nosuid,nodev,noatime,barrier=1 wait /dev/block/bootdevice/by-name/dsp /dsp ext4 ro,nosuid,nodev,barrier=1 wait /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 -- cgit v1.2.3 From 4c43f5845e3c28ec4af27c7ef3ad58abce07e2c4 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Thu, 18 Jan 2018 23:47:02 +0800 Subject: msm8996-common: Add Lineage power hal to manifest Change-Id: I03b213310b66be95d779c507dc22f748dc19c366 --- manifest.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manifest.xml b/manifest.xml index 1526f87..8edf6d6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -330,6 +330,15 @@ default + + vendor.lineage.power + hwbinder + 1.0 + + ILineagePower + default + + vendor.qti.gnss hwbinder -- cgit v1.2.3 From 588627f4bbd4a98c7c35ca64d7608647a0583ab9 Mon Sep 17 00:00:00 2001 From: Pawin Vongmasa Date: Wed, 3 May 2017 19:54:12 -0700 Subject: msm8996-common: Create media_profiles_V1_0.xml media_profiles_V1_0.xml is created from media_profiles.xml by replacing the dtd schema inside media_profiles.xml with an external reference to /system/etc/media_profiles_V1_0.dtd. Change-Id: I0fbb03603a72d0108a96bfa0f0a4ceb12ef3d430 --- configs/media_profiles.xml | 737 ---------------------------------------- configs/media_profiles_V1_0.xml | 665 ++++++++++++++++++++++++++++++++++++ msm8996.mk | 2 +- 3 files changed, 666 insertions(+), 738 deletions(-) delete mode 100644 configs/media_profiles.xml create mode 100644 configs/media_profiles_V1_0.xml diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml deleted file mode 100644 index 4298d71..0000000 --- a/configs/media_profiles.xml +++ /dev/null @@ -1,737 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/configs/media_profiles_V1_0.xml b/configs/media_profiles_V1_0.xml new file mode 100644 index 0000000..cbac453 --- /dev/null +++ b/configs/media_profiles_V1_0.xml @@ -0,0 +1,665 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msm8996.mk b/msm8996.mk index f786a7b..ff2c2ca 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -212,7 +212,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ $(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml + $(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ -- cgit v1.2.3 From e7c2e7a297fe9ccf6d254dd73763178d5cec706f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Tue, 27 Feb 2018 00:06:28 +0100 Subject: msm8996-common: Reduce dmesg verbose level by default. --- rootdir/etc/init.qcom.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 77e14be..d1fd36a 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -388,9 +388,9 @@ on boot # an ack packet comes out of order write /proc/sys/net/netfilter/nf_conntrack_tcp_be_liberal 1 - # Set the console loglevel to < KERN_INFO - # Set the default message loglevel to KERN_INFO - write /proc/sys/kernel/printk "6 6 1 7" + # Set the console loglevel to < KERN_WARNING + # Set the default message loglevel to KERN_WARNING + write /proc/sys/kernel/printk "4 4 1 7" # Allow access for CCID command/response timeout configuration chown system system /sys/module/ccid_bridge/parameters/bulk_msg_timeout -- cgit v1.2.3 From 954f3c5f32879f45f0ff5ce4016f3f79d7f4c510 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Thu, 4 Jan 2018 13:35:17 +0000 Subject: msm8996-common: Go with full CAF HALs * Switching to the CAF HALs is stricly necessary since the kernel rebase to the latest 8.1 tag. Additionally, in order to match the current HALs the following blobs are required: - Adreno blobs from: mata-user 8.0.0 OPM1.170911.213 214 release-keys - Vulkan blobs from: OnePlus3-user 8.0.0 OPR6.170623.013 15 release-keys - SDM and postproc from: OnePlus5-user 8.0.0 OPR6.170623.013 47 release-keys - Media blobs from: OnePlus3-user 8.0.0 OPR6.170623.013 15 release-keys * Extend the manifest accordingly. Change-Id: Ifc9c166d3fe80fa16e72c265c43a3f6394c1bcb3 --- proprietary-files.txt | 258 +++++++++++++++++++++++++------------------------- 1 file changed, 130 insertions(+), 128 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 2528c3d..6df8ab8 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -344,75 +344,77 @@ vendor/lib64/libxtadapter.so vendor/lib64/libxtwifi_ulp_adaptor.so vendor/lib64/vendor.qti.gnss@1.0_vendor.so -# Graphics -vendor/lib/egl/eglSubDriverAndroid.so -vendor/lib/egl/libEGL_adreno.so -vendor/lib/egl/libGLESv1_CM_adreno.so -vendor/lib/egl/libGLESv2_adreno.so -vendor/lib/egl/libq3dtools_adreno.so -vendor/lib/egl/libQTapGLES.so -vendor/lib/libadreno_utils.so -vendor/lib/libbccQTI.so -vendor/lib/libC2D2.so -vendor/lib/libc2d30_bltlib.so -vendor/lib/libc2d30-a5xx.so -vendor/lib/libCB.so -vendor/lib/libgsl.so -vendor/lib/libllvm-glnext.so -vendor/lib/libllvm-qcom.so -vendor/lib/libllvm-qgl.so -vendor/lib/libmm-disp-apis.so -vendor/lib/libmm-qdcm.so -vendor/lib/libOpenCL.so -vendor/lib/librs_adreno_sha1.so -vendor/lib/librs_adreno.so -vendor/lib/libRSDriver_adreno.so -vendor/lib64/egl/eglSubDriverAndroid.so -vendor/lib64/egl/libEGL_adreno.so -vendor/lib64/egl/libGLESv1_CM_adreno.so -vendor/lib64/egl/libGLESv2_adreno.so -vendor/lib64/egl/libq3dtools_adreno.so -vendor/lib64/egl/libQTapGLES.so -vendor/lib64/libadreno_utils.so -vendor/lib64/libbccQTI.so -vendor/lib64/libC2D2.so -vendor/lib64/libc2d30_bltlib.so -vendor/lib64/libc2d30-a5xx.so -vendor/lib64/libCB.so -vendor/lib64/libgsl.so -vendor/lib64/libllvm-glnext.so -vendor/lib64/libllvm-qcom.so -vendor/lib64/libllvm-qgl.so -vendor/lib64/libmm-disp-apis.so -vendor/lib64/libmm-qdcm.so -vendor/lib64/libOpenCL.so -vendor/lib64/librs_adreno_sha1.so -vendor/lib64/librs_adreno.so -vendor/lib64/libRSDriver_adreno.so - -# Graphics (HDR) -vendor/lib/libhdr_tm.so -vendor/lib64/libhdr_tm.so - -# Graphics (SDM) -lib/libsdm-disp-apis.so:vendor/lib/libsdm-disp-apis.so -lib64/libsdm-disp-apis.so:vendor/lib64/libsdm-disp-apis.so -vendor/lib64/libscalar.so -vendor/lib64/libsdm-color.so -vendor/lib64/libsdm-diag.so --vendor/lib64/libsdm-disp-vndapis.so -vendor/lib64/libsdmextension.so -vendor/lib64/libtinyxml2_1.so -vendor/lib/libscalar.so -vendor/lib/libsdm-color.so -vendor/lib/libsdm-diag.so --vendor/lib/libsdm-disp-vndapis.so -vendor/lib/libsdmextension.so -vendor/lib/libtinyxml2_1.so - -# Graphics (Vulkan) -vendor/lib/hw/vulkan.msm8996.so -vendor/lib64/hw/vulkan.msm8996.so +# Graphics - from mata - OPM1.170911.213 +vendor/lib/egl/eglSubDriverAndroid.so|4eefcd82b666a95588af1213c28eb4e9b9d9ee33 +vendor/lib/egl/libEGL_adreno.so|7e9cef1dae8c675962a83638539d6e87c8070f6e +vendor/lib/egl/libGLESv1_CM_adreno.so|b6804a9e72fab7f7708cc23e6c6c166c0cc3df3e +vendor/lib/egl/libGLESv2_adreno.so|6a4b12190c297c8f21bba777876cfd6c27207158 +vendor/lib/egl/libq3dtools_adreno.so|0859b1ea8b49ed14429ca45826551f1633895264 +vendor/lib/egl/libQTapGLES.so|59a92cc3ffc98147498ee6895e60d66d8549796a +vendor/lib/libadreno_utils.so|4efe5db073db43b7244d9ec50fc30d59601daf58 +vendor/lib/libbccQTI.so|3040265d853927de8560c997a4c4e618eb28f7ed +vendor/lib/libC2D2.so|8830eb461ac5f920b21526ed5c536da162cbadaa +vendor/lib/libc2d30_bltlib.so|d33d00cb11bc9851046a718f0929752fe462f214 +vendor/lib/libc2d30-a5xx.so|958fb589a61cde6813f9a98f2e2500dc36a207f0 +vendor/lib/libCB.so|3434a758b6ab785f54d7c48d88b269e6fdda6581 +vendor/lib/libgsl.so|415c0a927a2fc896b2264d1500f86c3e08daa824 +vendor/lib/libllvm-glnext.so|a1b8ca878225846d694b22ff1a8759dbdff601b1 +vendor/lib/libllvm-qcom.so|c6faabffd7839537a7b25fb6743c6aadbcd22147 +vendor/lib/libllvm-qgl.so|1d3c6e398505324d8fac9997c34e0a36c8ae5c18 +vendor/lib/libmm-disp-apis.so|111288b23bd2e68b4e01eb9b93959096ca5bbfcc +vendor/lib/libmm-qdcm.so|0ca97b59682e297256d20116acc750472aeb00fd +vendor/lib/libOpenCL.so|5dc66f1d3008e79c1a1b9483399423dbe737a773 +vendor/lib/libqseed3.so|9f93d730b8d2c44a9864aea18bca4f5eb1a11fe5 +vendor/lib/librs_adreno_sha1.so|14a760b6d06e3f6b8911b8f0c034ec91cce8a954 +vendor/lib/librs_adreno.so|ba45fb2ac5ea9f881eb54fda685d19752859893e +vendor/lib/libRSDriver_adreno.so|2136ecfc36098b3d1ea6e83668c987bad92f32d4 +vendor/lib64/egl/eglSubDriverAndroid.so|13952992a54300c02ba8302f899b4285bc231180 +vendor/lib64/egl/libEGL_adreno.so|60375ff06520aaee699771e2c5ce03943c665290 +vendor/lib64/egl/libGLESv1_CM_adreno.so|f82b3e4b5b13258654957328b7b8ad6a55270718 +vendor/lib64/egl/libGLESv2_adreno.so|eb674f2bf5ed88d76c53272f7ee5a6e75332b1f2 +vendor/lib64/egl/libq3dtools_adreno.so|ed700e0cafafad66293e1406d9a189e41b5fcba7 +vendor/lib64/egl/libQTapGLES.so|5842caa7a0c8e04c3a9900cd3178971fe47ec55e +vendor/lib64/libadreno_utils.so|df34a647e6e381c8474f9961d1e45b0f33ea9b78 +vendor/lib64/libbccQTI.so|073d468d5feedbd227652efe069a2bd32131db4f +vendor/lib64/libC2D2.so|12f97946eb0e201e10128f7cf483bf97de604fea +vendor/lib64/libc2d30_bltlib.so|5c1625ce6618f39a779ed05fb6c803a0d2b2619f +vendor/lib64/libc2d30-a5xx.so|7c93d41e945a7bc9855bb754c4f95d89c2d9a94b +vendor/lib64/libCB.so|8058fbce88890253eb05c1e647d7cccfe284d44b +vendor/lib64/libgsl.so|2f54e4f0b4bdb1ac8a54be6dfe7fdfca1a1cc664 +vendor/lib64/libllvm-glnext.so|d30ca2dca50f4a70cfdc2615c090abf94714c39e +vendor/lib64/libllvm-qcom.so|e0bb85dd6dc2b1c14f3b97129276455fb1bb4e44 +vendor/lib64/libllvm-qgl.so|7b302d3923bcec768de104029db53038135b56dc +vendor/lib64/libmm-disp-apis.so|5360bcf2c25fd1f97073302e2a80003479d41241 +vendor/lib64/libmm-qdcm.so|cf8b25a503a2727e7fb189e6c6c809568e769058 +vendor/lib64/libOpenCL.so|eae487ec35aa44b075ebbfc5b306387ca55f01bb +vendor/lib64/libqseed3.so|e06822d342c84d6c5412325ad316c3578b04d793 +vendor/lib64/librs_adreno_sha1.so|f9a039d517869d0abc61ce168cac525e354c18b1 +vendor/lib64/librs_adreno.so|25a9a431fb34c32344f1b706224b46747667e130 +vendor/lib64/libRSDriver_adreno.so|17de89c1c3b5001dc354d20613d38a027ea8c851 + +# Graphics (HDR) - from mata - OPM1.170911.213 +vendor/lib/libhdr_tm.so|c6d5abfa703cd8336da201641f9b4b98426c2ed2 +vendor/lib64/libhdr_tm.so|821897a43b0980dfbd39a4e15dc743448fbf0fb0 + +# Graphics (SDM) - from cheeseburger - OPR6.170623.013 +lib/libsdm-disp-apis.so:vendor/lib/libsdm-disp-apis.so|152b51f294f170ebd3528d80c6e65fcc4436f6aa +lib64/libsdm-disp-apis.so:vendor/lib64/libsdm-disp-apis.so|629e27c4bb84af37588831ed122167d609d767b0 +vendor/lib64/libscalar.so|cf5a230e7720d86ac030eaaca7c96b153c83e475 +vendor/lib64/libsdm-color.so|0db611bb5babef142b35de1769865c1d50772bda +vendor/lib64/libsdm-diag.so|77d9f47d47831211e9811b691e3271c720663816 +-vendor/lib64/libsdm-disp-vndapis.so|c6f930ed2b3163b59b21ab8d0751a625b1d4308d +vendor/lib64/libsdmextension.so|a2ac403747a4ad8716168b4f00721ec4fb19c5aa +vendor/lib64/libtinyxml2_1.so|eb4cd93e051980b8b35f5eeebd3d980e033cb87f +vendor/lib/libscalar.so|b94311683c8ae9ff3363fc5cf729d9bc64589096 +vendor/lib/libsdm-color.so|9404c85d63894562733484ede557c3ac9635c52d +vendor/lib/libsdm-diag.so|8613ea99b5fa79105657f8fc45982241a55c7fd2 +-vendor/lib/libsdm-disp-vndapis.so|e0964709bc17595eb5cd9dedabf703117a2714f8 +vendor/lib/libsdmextension.so|5d539b3215c6551a1fedb8c167d2fa086c9ed1ff +vendor/lib/libtinyxml2_1.so|fddc48298389f15337c65a1b1fa3361925fa937e + +# Graphics (Vulkan) - from op3 - OPR6.170623.013 +vendor/lib/hw/vulkan.msm8996.so|dcd44a4df3234649eb25d5e16dfc16ab4a4284f1 +vendor/lib64/hw/vulkan.msm8996.so|7531d20d0ef872e704ce4949e52ff2a6857c72d8 # Graphics firmware vendor/firmware/a530_pfp.fw @@ -484,41 +486,41 @@ vendor/lib/vendor.qti.voiceprint@1.0.so vendor/lib64/hw/sound_trigger.primary.msm8996.so vendor/lib64/vendor.qti.voiceprint@1.0.so -# Media --vendor/lib/libgpustats.so -vendor/lib/libI420colorconvert.so -vendor/lib/libOmxAacDec.so -vendor/lib/libOmxAlacDec.so -vendor/lib/libOmxAlacDecSw.so -vendor/lib/libOmxAmrDec.so -vendor/lib/libOmxAmrwbplusDec.so -vendor/lib/libOmxApeDec.so -vendor/lib/libOmxApeDecSw.so -vendor/lib/libOmxEvrcDec.so -vendor/lib/libOmxQcelp13Dec.so -vendor/lib/libOmxVideoDSMode.so -vendor/lib/libOmxVpp.so -vendor/lib/libOmxWmaDec.so -vendor/lib/libmm-color-convertor.so -vendor/lib/libvpphvx.so -vendor/lib/libvpplibrary.so -vendor/lib/libvqzip.so --vendor/lib64/libgpustats.so -vendor/lib64/libI420colorconvert.so -vendor/lib64/libOmxAacDec.so -vendor/lib64/libOmxAlacDec.so -vendor/lib64/libOmxAlacDecSw.so -vendor/lib64/libOmxAmrDec.so -vendor/lib64/libOmxAmrwbplusDec.so -vendor/lib64/libOmxApeDec.so -vendor/lib64/libOmxApeDecSw.so -vendor/lib64/libOmxEvrcDec.so -vendor/lib64/libOmxQcelp13Dec.so -vendor/lib64/libOmxVpp.so -vendor/lib64/libOmxWmaDec.so -vendor/lib64/libmm-color-convertor.so -vendor/lib64/libvpphvx.so -vendor/lib64/libvpplibrary.so +# Media - from op3 - OPR6.170623.013 +-vendor/lib/libgpustats.so|176395bf6055b3475080d9bae65684820bafab49 +vendor/lib/libI420colorconvert.so|38212d068cd62a91a7cf88337a9655c0fd2c46ca +vendor/lib/libOmxAacDec.so|97d293d79b13861e24dac73ab9f40742ee818907 +vendor/lib/libOmxAlacDec.so|f4b863ddd41f27d23b1d2c9f68f4162a03a7ab07 +vendor/lib/libOmxAlacDecSw.so|bdf6cc236bd864d264754f5608c4655ed96558ee +vendor/lib/libOmxAmrDec.so|09e1952a90160e009d51204b5d833908a0f745f7 +vendor/lib/libOmxAmrwbplusDec.so|17695d74555241750399c556cb9570b25f40f2aa +vendor/lib/libOmxApeDec.so|5f284c3629c28a16c0e9e9a9a981ec064f5e3516 +vendor/lib/libOmxApeDecSw.so|0d5e081f2634d0d375518e9227a5708586b2f648 +vendor/lib/libOmxEvrcDec.so|20320f64a288a74f28154eb6b53a6790034799ca +vendor/lib/libOmxQcelp13Dec.so|ac8733bccd9080e4cd8f78164ea5601f6b37eeec +vendor/lib/libOmxVideoDSMode.so|7d25cfdff92adf8c90aa5565fca60e705d3fb4aa +vendor/lib/libOmxVpp.so|e732e95e48659f166368d5e4d9ca6d0502ed0290 +vendor/lib/libOmxWmaDec.so|723256e9722a2d29328432ea3750c03dd889739d +vendor/lib/libmm-color-convertor.so|7b22d9452ece4d1d758dbc076ca59b43f5dac298 +vendor/lib/libvpphvx.so|b095e79409b7927f64845b9086b29a131a3f5d93 +vendor/lib/libvpplibrary.so|2e4573d902dbb8f59ee12709181dd9b21aa21347 +vendor/lib/libvqzip.so|be0c08dee3aaf0c0040d3ecbdda71b72dd4ee53f +-vendor/lib64/libgpustats.so|34c19702c14ddfb22fe0caffb4a22f842efe206c +vendor/lib64/libI420colorconvert.so|5c0dc1548bf7460af33748f5ebcc424d0fb4086a +vendor/lib64/libOmxAacDec.so|36480e7e5a5b5c1213030577058f4fa3aaf13364 +vendor/lib64/libOmxAlacDec.so|81092745725b144aece37a8a6e6477b4cd11c5e8 +vendor/lib64/libOmxAlacDecSw.so|776efbcf019e2cddb5c5d2d4d8dd09da022ce159 +vendor/lib64/libOmxAmrDec.so|4331a8d0476cc3ab2a084208d1c220b424599d83 +vendor/lib64/libOmxAmrwbplusDec.so|9f04305f47afd1798c4cb36111a5612fe288819f +vendor/lib64/libOmxApeDec.so|7bd5e0aadd5fc79628afbe89f1573c3db10b8d3c +vendor/lib64/libOmxApeDecSw.so|be950c4f2df3c56729006a321af29a87617cd32c +vendor/lib64/libOmxEvrcDec.so|688a524158e3f3611ea19b61861245582839d7b7 +vendor/lib64/libOmxQcelp13Dec.so|d729fa0178bc9dc19a9a53ed3fc416c3f6aaf6f4 +vendor/lib64/libOmxVpp.so|48953e90bb82eda736789eeb9193fc1d3b5f57f8 +vendor/lib64/libOmxWmaDec.so|008e871ac07dc66a0f50e12ec9efe93e408de751 +vendor/lib64/libmm-color-convertor.so|2efb05d595c2d55457d88897562115e340631fe6 +vendor/lib64/libvpphvx.so|1a83a5b32b4f65725a0d4485b402356dfbcd859c +vendor/lib64/libvpplibrary.so|733e8aa44490239a8b038eaa862cd4f1bdbe259e # Perf lib/vendor.qti.hardware.iop@1.0.so @@ -565,30 +567,30 @@ vendor/bin/pm-service vendor/lib64/libperipheral_client.so vendor/lib/libperipheral_client.so -# Postprocessing -etc/permissions/com.qti.snapdragon.sdk.display.xml -framework/com.qti.snapdragon.sdk.display.jar -lib/libsd_sdk_display.so:vendor/lib/libsd_sdk_display.so -lib/vendor.display.color@1.0.so -lib/vendor.display.postproc@1.0.so -lib/vendor.qti.hardware.qdutils_disp@1.0.so -lib64/libsd_sdk_display.so:vendor/lib64/libsd_sdk_display.so -lib64/vendor.display.color@1.0.so -lib64/vendor.display.postproc@1.0.so -lib64/vendor.qti.hardware.qdutils_disp@1.0.so -vendor/bin/hw/vendor.display.color@1.0-service -vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti -vendor/bin/mm-pp-dpps -vendor/etc/init/vendor.display.color@1.0-service.rc -vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc -vendor/lib64/libdisp-aba.so -vendor/lib64/vendor.display.color@1.0_vendor.so -vendor/lib64/vendor.display.postproc@1.0_vendor.so -vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0_vendor.so -vendor/lib/libdisp-aba.so -vendor/lib/vendor.display.color@1.0_vendor.so -vendor/lib/vendor.display.postproc@1.0_vendor.so -vendor/lib/vendor.qti.hardware.qdutils_disp@1.0_vendor.so +# Postprocessing - from cheeseburger - OPR6.170623.013 +etc/permissions/com.qti.snapdragon.sdk.display.xml|0bff16d681e75f203c1e11ff33afba82490e49b3 +framework/com.qti.snapdragon.sdk.display.jar|2865536d37515945ae3466f2492cd36e6863fa2e +lib/libsd_sdk_display.so:vendor/lib/libsd_sdk_display.so|e3b3be83d2d181e3b26ba105da0cbc06688966b2 +lib/vendor.display.color@1.0.so|baa2dad5f8a9df6153e4fd2ba5428e1e2ed0f68b +lib/vendor.display.postproc@1.0.so|b90d5ef619f2069731250250a36d6a947dce920b +lib/vendor.qti.hardware.qdutils_disp@1.0.so|892b272dddf0b85eebeea559c62c028bb4bd77dc +lib64/libsd_sdk_display.so:vendor/lib64/libsd_sdk_display.so|a019f586ef761f852cdd04dce259cb8922e2633c +lib64/vendor.display.color@1.0.so|31d03c1a3ee66554d334ac16d4796d730ded72ed +lib64/vendor.display.postproc@1.0.so|863190e800e47b13797634679eece852e8fd8c6c +lib64/vendor.qti.hardware.qdutils_disp@1.0.so|00eca62445ae716e7e202bc7d79caa1c7d5d5234 +vendor/bin/hw/vendor.display.color@1.0-service|3f42a79e4a1ef0009637b4954c9e4a38680dd88c +vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti|0ed4f41dd0868e12c57ef0ecf493dafa6885ace2 +vendor/bin/mm-pp-dpps|034d0550197c7a64b17ab099ed9fb379538464e0 +vendor/etc/init/vendor.display.color@1.0-service.rc|5ad673f879b3685a0e79b5633437e5499cb94f48 +vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc|69d9cbc54f8ac0a0fb010f92bfa7de5981d643cf +vendor/lib64/libdisp-aba.so|67f743e755742690d3e921d9db6ad3f5410ff291 +vendor/lib64/vendor.display.color@1.0_vendor.so|34b397e1c6f8077af848c9353d158ef8f458c2b8 +vendor/lib64/vendor.display.postproc@1.0_vendor.so|e57cfa45f72430d8c749a251aa423ab665a04088 +vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0_vendor.so|ede5278f1774fe1ea9eb9b0de1cdd01054ef6c8a +vendor/lib/libdisp-aba.so|318c3f38ba34848b2a35e5069ff0a176f4679a35 +vendor/lib/vendor.display.color@1.0_vendor.so|615820f1ddbf3e06b501aca6b948196b9e8027ab +vendor/lib/vendor.display.postproc@1.0_vendor.so|dcabce39e2a9cab878fea28a52be053bdc752e59 +vendor/lib/vendor.qti.hardware.qdutils_disp@1.0_vendor.so|8414feb896b30cf23c1af2055c836e54843a90d7 # QMI etc/permissions/qti_permissions.xml -- cgit v1.2.3 From e97371b30306f1483c576743bb00ee6f3cc2f4de Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Wed, 14 Feb 2018 23:21:57 +0000 Subject: msm8996-common: Update Adreno graphics stack * From: OnePlus5-user 8.0.0 OPR6.170623.013 74 release-keys Change-Id: I3e3f46f0810d1b4cb479e7692f31e6607feb90f1 --- proprietary-files.txt | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 6df8ab8..3004bc5 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -344,57 +344,57 @@ vendor/lib64/libxtadapter.so vendor/lib64/libxtwifi_ulp_adaptor.so vendor/lib64/vendor.qti.gnss@1.0_vendor.so -# Graphics - from mata - OPM1.170911.213 -vendor/lib/egl/eglSubDriverAndroid.so|4eefcd82b666a95588af1213c28eb4e9b9d9ee33 +# Graphics - from cheeseburger - OPR6.170623.013 +vendor/lib/egl/eglSubDriverAndroid.so|ac4d51b7a0f0d04f34042f980fd84b7af64140c2 vendor/lib/egl/libEGL_adreno.so|7e9cef1dae8c675962a83638539d6e87c8070f6e vendor/lib/egl/libGLESv1_CM_adreno.so|b6804a9e72fab7f7708cc23e6c6c166c0cc3df3e -vendor/lib/egl/libGLESv2_adreno.so|6a4b12190c297c8f21bba777876cfd6c27207158 +vendor/lib/egl/libGLESv2_adreno.so|3251cc22ebd6da9ac406d66fddb39422f81283c1 vendor/lib/egl/libq3dtools_adreno.so|0859b1ea8b49ed14429ca45826551f1633895264 vendor/lib/egl/libQTapGLES.so|59a92cc3ffc98147498ee6895e60d66d8549796a vendor/lib/libadreno_utils.so|4efe5db073db43b7244d9ec50fc30d59601daf58 -vendor/lib/libbccQTI.so|3040265d853927de8560c997a4c4e618eb28f7ed +vendor/lib/libbccQTI.so|b3c81111663a75c3c33c4a02bfbc0ea8bc6c5bb2 vendor/lib/libC2D2.so|8830eb461ac5f920b21526ed5c536da162cbadaa vendor/lib/libc2d30_bltlib.so|d33d00cb11bc9851046a718f0929752fe462f214 vendor/lib/libc2d30-a5xx.so|958fb589a61cde6813f9a98f2e2500dc36a207f0 -vendor/lib/libCB.so|3434a758b6ab785f54d7c48d88b269e6fdda6581 +vendor/lib/libCB.so|6b3caddd5b37b06ab9b6a8f8594a89c45d42fbef vendor/lib/libgsl.so|415c0a927a2fc896b2264d1500f86c3e08daa824 -vendor/lib/libllvm-glnext.so|a1b8ca878225846d694b22ff1a8759dbdff601b1 -vendor/lib/libllvm-qcom.so|c6faabffd7839537a7b25fb6743c6aadbcd22147 -vendor/lib/libllvm-qgl.so|1d3c6e398505324d8fac9997c34e0a36c8ae5c18 -vendor/lib/libmm-disp-apis.so|111288b23bd2e68b4e01eb9b93959096ca5bbfcc -vendor/lib/libmm-qdcm.so|0ca97b59682e297256d20116acc750472aeb00fd +vendor/lib/libllvm-glnext.so|088c1e73bf360fe8ac619ecb48c2222446152e1c +vendor/lib/libllvm-qcom.so|f386dfb25738923f6d85bd02e2f6da0824da24bc +vendor/lib/libllvm-qgl.so|e16cb0919b12738fff78c9b4c16b9205abff88cb +vendor/lib/libmm-disp-apis.so|01875b0eedf37f224fdada719377451ccd27e640 +vendor/lib/libmm-qdcm.so|b06fcb152371a82248724863ddff98ce26fa0621 vendor/lib/libOpenCL.so|5dc66f1d3008e79c1a1b9483399423dbe737a773 -vendor/lib/libqseed3.so|9f93d730b8d2c44a9864aea18bca4f5eb1a11fe5 -vendor/lib/librs_adreno_sha1.so|14a760b6d06e3f6b8911b8f0c034ec91cce8a954 +vendor/lib/libqseed3.so|1f533a4f49953577ceab0caae4467ec50fde1193 +vendor/lib/librs_adreno_sha1.so|106b78053703bae0f62a8a5d6503510d445de64b vendor/lib/librs_adreno.so|ba45fb2ac5ea9f881eb54fda685d19752859893e -vendor/lib/libRSDriver_adreno.so|2136ecfc36098b3d1ea6e83668c987bad92f32d4 -vendor/lib64/egl/eglSubDriverAndroid.so|13952992a54300c02ba8302f899b4285bc231180 +vendor/lib/libRSDriver_adreno.so|201410b612bbf14936ddca9858e6d2fa608d5fd9 +vendor/lib64/egl/eglSubDriverAndroid.so|f65610275a6834a161bf20e8fa0270803deaafe3 vendor/lib64/egl/libEGL_adreno.so|60375ff06520aaee699771e2c5ce03943c665290 vendor/lib64/egl/libGLESv1_CM_adreno.so|f82b3e4b5b13258654957328b7b8ad6a55270718 -vendor/lib64/egl/libGLESv2_adreno.so|eb674f2bf5ed88d76c53272f7ee5a6e75332b1f2 +vendor/lib64/egl/libGLESv2_adreno.so|871d74d9bdaef7b928d19f5aeee7fbc08e3831bd vendor/lib64/egl/libq3dtools_adreno.so|ed700e0cafafad66293e1406d9a189e41b5fcba7 vendor/lib64/egl/libQTapGLES.so|5842caa7a0c8e04c3a9900cd3178971fe47ec55e vendor/lib64/libadreno_utils.so|df34a647e6e381c8474f9961d1e45b0f33ea9b78 -vendor/lib64/libbccQTI.so|073d468d5feedbd227652efe069a2bd32131db4f +vendor/lib64/libbccQTI.so|12049b2950dda021771ff3b74c342316e30077fa vendor/lib64/libC2D2.so|12f97946eb0e201e10128f7cf483bf97de604fea vendor/lib64/libc2d30_bltlib.so|5c1625ce6618f39a779ed05fb6c803a0d2b2619f vendor/lib64/libc2d30-a5xx.so|7c93d41e945a7bc9855bb754c4f95d89c2d9a94b -vendor/lib64/libCB.so|8058fbce88890253eb05c1e647d7cccfe284d44b +vendor/lib64/libCB.so|339bc32a208f138dc6220f374ff5a6172cbc4783 vendor/lib64/libgsl.so|2f54e4f0b4bdb1ac8a54be6dfe7fdfca1a1cc664 -vendor/lib64/libllvm-glnext.so|d30ca2dca50f4a70cfdc2615c090abf94714c39e -vendor/lib64/libllvm-qcom.so|e0bb85dd6dc2b1c14f3b97129276455fb1bb4e44 -vendor/lib64/libllvm-qgl.so|7b302d3923bcec768de104029db53038135b56dc -vendor/lib64/libmm-disp-apis.so|5360bcf2c25fd1f97073302e2a80003479d41241 -vendor/lib64/libmm-qdcm.so|cf8b25a503a2727e7fb189e6c6c809568e769058 +vendor/lib64/libllvm-glnext.so|d70b9c49ab16944ca3f9f8542ee72ad80c920f69 +vendor/lib64/libllvm-qcom.so|b0c9938edd357894944777dc07af0fa7dcf491ea +vendor/lib64/libllvm-qgl.so|eb55611e95d9b01f68c0adad08f024b8ef29a540 +vendor/lib64/libmm-disp-apis.so|d4ed09c076e25c115a8184ca26340907fdf98c86 +vendor/lib64/libmm-qdcm.so|2b679cb476dcdd69eadbb97543eeebd2e4032596 vendor/lib64/libOpenCL.so|eae487ec35aa44b075ebbfc5b306387ca55f01bb -vendor/lib64/libqseed3.so|e06822d342c84d6c5412325ad316c3578b04d793 -vendor/lib64/librs_adreno_sha1.so|f9a039d517869d0abc61ce168cac525e354c18b1 +vendor/lib64/libqseed3.so|639aec109c64d26321849b2c7012f0e3d0b1af72 +vendor/lib64/librs_adreno_sha1.so|8e492eb0656a4dfae6936ab52b754f5006d8d25a vendor/lib64/librs_adreno.so|25a9a431fb34c32344f1b706224b46747667e130 -vendor/lib64/libRSDriver_adreno.so|17de89c1c3b5001dc354d20613d38a027ea8c851 +vendor/lib64/libRSDriver_adreno.so|5356c65f29b46964ffefa8065b3e2c0261433c40 -# Graphics (HDR) - from mata - OPM1.170911.213 -vendor/lib/libhdr_tm.so|c6d5abfa703cd8336da201641f9b4b98426c2ed2 -vendor/lib64/libhdr_tm.so|821897a43b0980dfbd39a4e15dc743448fbf0fb0 +# Graphics (HDR) - from cheeseburger - OPR6.170623.013 +vendor/lib/libhdr_tm.so|cf23edb8174445f87c6e6394c48cdbda70dff98b +vendor/lib64/libhdr_tm.so|8ced1c36da811e0f66d2eed9f6f9d6218ab93bd0 # Graphics (SDM) - from cheeseburger - OPR6.170623.013 lib/libsdm-disp-apis.so:vendor/lib/libsdm-disp-apis.so|152b51f294f170ebd3528d80c6e65fcc4436f6aa -- cgit v1.2.3 From 229465116a35e81f02753be86949cb99ee550a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 08:53:10 +0100 Subject: msm8996-common: Import media_codecs.xml and media_codecs_performance.xml from ZUI 3.5.261. --- configs/media_codecs.xml | 9 +++-- configs/media_codecs_performance.xml | 68 ++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml index 5c8ba25..eed96b9 100644 --- a/configs/media_codecs.xml +++ b/configs/media_codecs.xml @@ -126,7 +126,7 @@ Only the three quirks included above are recognized at this point: - + @@ -134,6 +134,7 @@ Only the three quirks included above are recognized at this point: + @@ -199,6 +200,7 @@ Only the three quirks included above are recognized at this point: + @@ -386,8 +388,9 @@ Only the three quirks included above are recognized at this point: - + + + - diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml index 917ec7d..c16aeb3 100644 --- a/configs/media_codecs_performance.xml +++ b/configs/media_codecs_performance.xml @@ -32,7 +32,7 @@ limitations under the License. - + @@ -50,19 +50,19 @@ limitations under the License. - - - - + + + + - + - + - + @@ -71,15 +71,15 @@ limitations under the License. - - - + + + - - - - + + + + @@ -87,7 +87,7 @@ limitations under the License. - + @@ -101,24 +101,24 @@ limitations under the License. - + - - - - + + + + - - - - - + + + + + @@ -126,16 +126,16 @@ limitations under the License. - - - - + + + + - - - - + + + + -- cgit v1.2.3 From 32f51e4905944a31286dd8622164301ccbb60985 Mon Sep 17 00:00:00 2001 From: Rashed Abdel-Tawab Date: Fri, 2 Feb 2018 19:39:50 -0800 Subject: msm8996-common: Set shipping API level via inherited makefile * PRODUCT_SHIPPING_API_LEVEL is set there Change-Id: I8adecfbaafb538277f6451a5dbc8abc279bf0c15 --- msm8996.mk | 1 + vendor.prop | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/msm8996.mk b/msm8996.mk index ff2c2ca..0a662a2 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -20,6 +20,7 @@ # included in a build is to use PRODUCT_PACKAGES in a product # definition file). # +$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_m.mk) # Get non-open-source specific aspects $(call inherit-product, vendor/zuk/msm8996-common/msm8996-common-vendor.mk) diff --git a/vendor.prop b/vendor.prop index 79852a4..aa51953 100644 --- a/vendor.prop +++ b/vendor.prop @@ -44,9 +44,6 @@ persist.data.netmgrd.qos.enable=true ro.use_data_netmgrd=true persist.data.iwlan.enable=true -# Device was launched with M -ro.product.first_api_level=23 - # Display (Qualcomm AD) ro.qualcomm.cabl=2 ro.qcom.ad=1 -- cgit v1.2.3 From e950c409d31f6abff15c33865090e79f8a7fe2df Mon Sep 17 00:00:00 2001 From: Srinu Gorle Date: Fri, 2 Sep 2016 17:47:36 +0530 Subject: msm8996-common: Disable PQ feature for video encoding by default Set the properties to false to disable PQ feature for video encoding Change-Id: Ic81358b24254f9d34d12ef09ef7127ddc1b08635 CRs-Fixed: 1062824 --- vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor.prop b/vendor.prop index aa51953..7205b2c 100644 --- a/vendor.prop +++ b/vendor.prop @@ -72,6 +72,7 @@ ro.gps.agps_provider=1 vendor.audio.hw.aac.encoder=true # Media +vendor.vidc.enc.disable.pq=true vendor.audio.flac.sw.decoder.24bit=true media.aac_51_output_enabled=true mm.enable.smoothstreaming=true -- cgit v1.2.3 From 9e65c001e6a6e582783ccc1ed28faad55a36a8c0 Mon Sep 17 00:00:00 2001 From: Nirmal Abraham Date: Wed, 26 Jul 2017 15:54:39 +0530 Subject: msm8996-common: Disable SF Latch Buffer Signaled property Change-Id: I682b30fbefdfbd4d8478a82148d5984138078957 --- vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor.prop b/vendor.prop index 7205b2c..773ae1e 100644 --- a/vendor.prop +++ b/vendor.prop @@ -58,6 +58,7 @@ ro.opa.eligible_device=true # Graphics debug.gralloc.enable_fb_ubwc=1 +debug.sf.latch_unsignaled=1 persist.hwc.enable_vds=1 ro.opengles.version=196610 ro.sf.lcd_density=480 -- cgit v1.2.3 From 97149324d088f88f6719a95c8466257ee48f7310 Mon Sep 17 00:00:00 2001 From: Baldev Sahu Date: Thu, 21 Sep 2017 12:03:32 +0530 Subject: msm8996-common: Disable skip validation Change-Id: Ia307c30f1d62ff1225e47389c3f5e1fde2bba4a9 --- vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor.prop b/vendor.prop index 773ae1e..e7902ce 100644 --- a/vendor.prop +++ b/vendor.prop @@ -62,6 +62,7 @@ debug.sf.latch_unsignaled=1 persist.hwc.enable_vds=1 ro.opengles.version=196610 ro.sf.lcd_density=480 +sdm.debug.disable_skip_validate=1 sdm.perf_hint_window=50 # GPS -- cgit v1.2.3 From f47b6712a1797ed39347751e94d410c30f54c944 Mon Sep 17 00:00:00 2001 From: Divya Narayanan Poojary Date: Thu, 3 Aug 2017 18:00:49 +0530 Subject: msm8996-common: Disable split a2dp split a2dp is not supported on 8909/8996/53/37. So disable "persist.bt.enable.splita2dp" Change-Id: If590c28a2f9bbfa5e154ea49c52d7141a61ab28c CRs-Fixed: 2081930 --- vendor.prop | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor.prop b/vendor.prop index e7902ce..41e864a 100644 --- a/vendor.prop +++ b/vendor.prop @@ -16,6 +16,7 @@ vendor.audio.safx.pbe.enabled=true persist.vendor.audio.fluence.voicecall=true persist.vendor.audio.fluence.voicerec=false persist.vendor.audio.fluence.speaker=true +persist.vendor.bt.enable.splita2dp=false ro.vendor.audio.sdk.fluencetype=fluence ro.vendor.audio.sdk.ssr=false vendor.audio.tunnel.encode=false -- cgit v1.2.3 From 1a2c0f85ef3669db61cf9a8aca69a7585c75cde9 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Thu, 19 Oct 2017 22:20:58 -0700 Subject: msm8996-common: Disable Vulkan StorageImageExtendedFormats capability Bug: 68017541 Test: adb shell cmd gpu vkjson | grep shaderStorageImageExtendedFormats Change-Id: Ia367e32eb26e57f52c09f5718c262a59dddb969b (cherry picked from commit bed61b5438ce4b6d38c599c18fa7cb749689a802) --- vendor.prop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vendor.prop b/vendor.prop index 41e864a..622eec0 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,3 +1,6 @@ +# Adreno +ro.qcom.adreno.qgl.ShaderStorageImageExtendedFormats=0 + # Audio af.fast_track_multiplier=1 vendor.audio_hal.period_size=192 -- cgit v1.2.3 From f7f5053a737cffc4ce651371eadfe493619281a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 10:31:05 +0100 Subject: msm8996-common: Reorganize BoardConfigCommon.mk * And move telephony-ext to msm8996.mk. --- BoardConfigCommon.mk | 103 +++++++++++++++++++++------------------------------ msm8996.mk | 7 ++++ 2 files changed, 50 insertions(+), 60 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 113d6b5..382d480 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -13,32 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -# -# This file sets variables that control the way modules are built -# thorughout the system. It should not be used to conditionally -# disable makefiles (the proper mechanism to control what gets -# included in a build is to use PRODUCT_PACKAGES in a product -# definition file). -# +BOARD_VENDOR := zuk VENDOR_PATH := device/zuk/msm8996-common TARGET_SPECIFIC_HEADER_PATH := $(VENDOR_PATH)/include -BOARD_VENDOR := zuk - -# Bootloader -TARGET_BOOTLOADER_BOARD_NAME := msm8996 -TARGET_NO_BOOTLOADER := true - -# Platform -TARGET_BOARD_PLATFORM := msm8996 -TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 - -# Properties -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop - # Architecture TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a @@ -54,20 +34,31 @@ TARGET_2ND_CPU_VARIANT := kryo TARGET_USES_64_BIT_BINDER := true +# Bootloader +TARGET_BOOTLOADER_BOARD_NAME := msm8996 +TARGET_NO_BOOTLOADER := true + # Kernel -BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff BOARD_KERNEL_BASE := 0x80000000 +BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=32M@0-0xffffffff +BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x00000100 -BOARD_RAMDISK_OFFSET := 0x01000000 -BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb +BOARD_RAMDISK_OFFSET := 0x01000000 TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_HEADER_ARCH := arm64 -TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android- TARGET_KERNEL_SOURCE := kernel/zuk/msm8996 +TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android- + +# Platform +TARGET_BOARD_PLATFORM := msm8996 +TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 + +# Properties +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop # Audio -AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true AUDIO_FEATURE_ENABLED_ANC_HEADSET := true AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true @@ -78,11 +69,12 @@ AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true AUDIO_FEATURE_ENABLED_FLUENCE := true AUDIO_FEATURE_ENABLED_HFP := true AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true +AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true -AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true +AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true BOARD_USES_ALSA_AUDIO := true USE_CUSTOM_AUDIO_POLICY := 1 USE_XML_AUDIO_POLICY_CONF := 1 @@ -97,8 +89,9 @@ QCOM_BT_USE_BTNV := true # Camera BOARD_QTI_CAMERA_32BIT_ONLY := true -USE_DEVICE_SPECIFIC_CAMERA := true TARGET_SUPPORT_HAL1 := false +TARGET_USES_MEDIA_EXTENSIONS := true +USE_DEVICE_SPECIFIC_CAMERA := true # Charger BOARD_CHARGER_ENABLE_SUSPEND := true @@ -107,10 +100,6 @@ BOARD_CHARGER_DISABLE_INIT_BLANK := true # CNE and DPM BOARD_USES_QCNE := true -# Crypto -TARGET_HW_DISK_ENCRYPTION := true -TARGET_KEYMASTER_WAIT_FOR_QSEE := true - # Dex ifeq ($(HOST_OS),linux) ifneq ($(TARGET_BUILD_VARIANT),eng) @@ -122,21 +111,27 @@ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true # Display BOARD_USES_ADRENO := true TARGET_CONTINUOUS_SPLASH_ENABLED := true +MAX_VIRTUAL_DISPLAY_DIMENSION := 4096 +TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true TARGET_USES_C2D_COMPOSITION := true -TARGET_USES_ION := true -TARGET_USES_NEW_ION_API :=true TARGET_USES_GRALLOC1 := true TARGET_USES_HWC2 := true +TARGET_USES_ION := true +TARGET_USES_NEW_ION_API :=true TARGET_USES_OVERLAY := true USE_OPENGL_RENDERER := true MAX_EGL_CACHE_KEY_SIZE := 12*1024 MAX_EGL_CACHE_SIZE := 2048*1024 -OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so -MAX_VIRTUAL_DISPLAY_DIMENSION := 4096 -TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true + +OVERRIDE_RS_DRIVER := libRSDriver_adreno.so + VSYNC_EVENT_PHASE_OFFSET_NS := 2000000 SF_VSYNC_EVENT_PHASE_OFFSET_NS := 6000000 +# Encryption +TARGET_HW_DISK_ENCRYPTION := true +TARGET_KEYMASTER_WAIT_FOR_QSEE := true + # Filesystem TARGET_FS_CONFIG_GEN := $(VENDOR_PATH)/config.fs @@ -146,25 +141,20 @@ BOARD_VENDOR_QCOM_LOC_PDK_FEATURE_SET := true TARGET_NO_RPC := true USE_DEVICE_SPECIFIC_GPS := true -# Hidl manifests +# HIDL DEVICE_MANIFEST_FILE := $(VENDOR_PATH)/manifest.xml DEVICE_MATRIX_FILE := $(VENDOR_PATH)/compatibility_matrix.xml # Init -TARGET_INIT_VENDOR_LIB := libinit_msm8996 -TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8996 TARGET_PLATFORM_DEVICE_BASE := /devices/soc/ # Lineage Hardware BOARD_HARDWARE_CLASS += \ $(VENDOR_PATH)/lineagehw -# Keystore +# Keymaster TARGET_PROVIDES_KEYMASTER := true -# Media -TARGET_USES_MEDIA_EXTENSIONS := true - # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 @@ -177,11 +167,13 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) TARGET_COPY_OUT_VENDOR := vendor -# QCOM hardware -BOARD_USES_QCOM_HARDWARE := true - -# QCOM Power +# Power TARGET_HAS_NO_WIFI_STATS := true +TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on" + +# QCOM +BOARD_USES_QCOM_HARDWARE := true +TARGET_USE_SDCLANG := true # Recovery TARGET_RECOVERY_FSTAB := $(VENDOR_PATH)/rootdir/etc/fstab.qcom @@ -196,18 +188,9 @@ TARGET_RIL_VARIANT := caf include device/qcom/sepolicy/sepolicy.mk BOARD_SEPOLICY_DIRS += $(VENDOR_PATH)/sepolicy -# Tap to wake node -TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on" - -# Telephony -PRODUCT_PACKAGES += \ - telephony-ext - -PRODUCT_BOOT_JARS += \ - telephony-ext - -# Use Snapdragon LLVM, if available -TARGET_USE_SDCLANG := true +# Vendor init +TARGET_INIT_VENDOR_LIB := libinit_msm8996 +TARGET_RECOVERY_DEVICE_MODULES := libinit_msm8996 # Wifi BOARD_HAS_QCOM_WLAN := true diff --git a/msm8996.mk b/msm8996.mk index 0a662a2..a5f5955 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -272,6 +272,13 @@ PRODUCT_PACKAGES += \ librmnetctl \ libxml2 +# Telephony +PRODUCT_PACKAGES += \ + telephony-ext + +PRODUCT_BOOT_JARS += \ + telephony-ext + # Seccomp policy PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/seccomp_policy/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ -- cgit v1.2.3 From 506b1dd4075e0a61cdceb50672ab3b445426226d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 11:37:21 +0100 Subject: msm8996-common: Enable TARGET_PROVIDES_LIBLIGHT by default. --- BoardConfigCommon.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 382d480..6a2abcd 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -155,6 +155,9 @@ BOARD_HARDWARE_CLASS += \ # Keymaster TARGET_PROVIDES_KEYMASTER := true +# Lights +TARGET_PROVIDES_LIBLIGHT := true + # Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 -- cgit v1.2.3 From a1d3f29b22d9cd428f9ac2fae16ab7f963a96c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 10:35:40 +0100 Subject: msm8996-common: Reorganize msm8996.mk --- msm8996.mk | 100 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 47 insertions(+), 53 deletions(-) diff --git a/msm8996.mk b/msm8996.mk index a5f5955..567cca3 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -33,6 +33,17 @@ DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay \ $(LOCAL_PATH)/overlay-lineage +# Screen density +PRODUCT_AAPT_CONFIG := normal +PRODUCT_AAPT_PREF_CONFIG := xxhdpi + +# Boot animation +TARGET_SCREEN_HEIGHT := 1920 +TARGET_SCREEN_WIDTH := 1080 + +# HWUI overrides +$(call inherit-product, frameworks/native/build/phone-xxhdpi-3072-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 \ @@ -69,18 +80,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml -# 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 - -# HWUI overrides -$(call inherit-product, frameworks/native/build/phone-xxhdpi-3072-hwui-memory.mk) - -# Haters gonna hate.. PRODUCT_CHARACTERISTICS := nosdcard # Audio @@ -121,10 +120,10 @@ PRODUCT_PACKAGES += \ # Camera PRODUCT_PACKAGES += \ - Snap \ camera.msm8996 \ libmm-qcamera \ - mm-qcamera-app + mm-qcamera-app \ + Snap # Connectivity Engine support (CNE) PRODUCT_PACKAGES += \ @@ -132,6 +131,17 @@ PRODUCT_PACKAGES += \ com.quicinc.cne \ services-ext +# Common init scripts +PRODUCT_PACKAGES += \ + fstab.qcom \ + init.qcom.rc \ + init.qcom.power.rc \ + init.qcom.usb.rc \ + init.qcom.usb.sh \ + init.qcom.bt.sh \ + ueventd.qcom.rc \ + init.qcom.sensors.sh + # Display PRODUCT_PACKAGES += \ copybit.msm8996 \ @@ -157,10 +167,10 @@ PRODUCT_PACKAGES += \ # GPS PRODUCT_PACKAGES += \ - libgnss \ - libgnsspps \ libcurl \ - gps.conf + gps.conf \ + libgnss \ + libgnsspps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ @@ -181,6 +191,16 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ims-ext-common +# Input +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/keylayout/fpc1020tp.kl:system/usr/keylayout/fpc1020tp.kl \ + $(LOCAL_PATH)/keylayout/goodix-ts.kl:system/usr/keylayout/goodix-ts.kl \ + $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ + $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:system/usr/keylayout/synaptics_dsx.kl \ + $(LOCAL_PATH)/keylayout/msm8996-tasha-mtp-snd-card_Button_Jack.kl:system/usr/keylayout/msm8996-tasha-mtp-snd-card_Button_Jack.kl \ + $(LOCAL_PATH)/keylayout/qpnp_pon.kl:system/usr/keylayout/qpnp_pon.kl + +# Media # IPA Manager PRODUCT_PACKAGES += \ ipacm \ @@ -200,15 +220,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ libjni_livedisplay -# Keylayouts -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/keylayout/fpc1020tp.kl:system/usr/keylayout/fpc1020tp.kl \ - $(LOCAL_PATH)/keylayout/goodix-ts.kl:system/usr/keylayout/goodix-ts.kl \ - $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \ - $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:system/usr/keylayout/synaptics_dsx.kl \ - $(LOCAL_PATH)/keylayout/msm8996-tasha-mtp-snd-card_Button_Jack.kl:system/usr/keylayout/msm8996-tasha-mtp-snd-card_Button_Jack.kl \ - $(LOCAL_PATH)/keylayout/qpnp_pon.kl:system/usr/keylayout/qpnp_pon.kl - # Media PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ @@ -242,36 +253,24 @@ PRODUCT_PACKAGES += \ # QCOM PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:system/etc/permissions/privapp-permissions-qti.xml - -# Qualcomm -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/privapp-permissions-oem.xml:system/etc/permissions/privapp-permissions-oem.xml + $(LOCAL_PATH)/configs/privapp-permissions-oem.xml:system/etc/permissions/privapp-permissions-oem.xml \ + $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:system/etc/permissions/privapp-permissions-qti.xml \ + $(LOCAL_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml # QMI PRODUCT_PACKAGES += \ libjson -# QTI -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml - -# Ramdisk -PRODUCT_PACKAGES += \ - fstab.qcom \ - init.qcom.power.rc \ - init.qcom.rc \ - init.qcom.usb.rc \ - init.qcom.usb.sh \ - init.qcom.bt.sh \ - ueventd.qcom.rc \ - init.qcom.sensors.sh - # RIL PRODUCT_PACKAGES += \ librmnetctl \ libxml2 +# Seccomp policy +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/seccomp_policy/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ + $(LOCAL_PATH)/seccomp_policy/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy + # Telephony PRODUCT_PACKAGES += \ telephony-ext @@ -279,20 +278,15 @@ PRODUCT_PACKAGES += \ PRODUCT_BOOT_JARS += \ telephony-ext -# Seccomp policy -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/seccomp_policy/mediacodec-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \ - $(LOCAL_PATH)/seccomp_policy/mediaextractor-seccomp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy - # Thermal PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/thermal-engine.conf:system/etc/thermal-engine.conf -# VNDK-SP: +# VNDK PRODUCT_PACKAGES += \ vndk-sp -# Wifi +# WiFi PRODUCT_PACKAGES += \ hostapd \ hostapd_cli \ -- cgit v1.2.3 From e921bdf693cdf87862e5f9ab4f3b468a5d20c4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 13:15:49 +0100 Subject: msm8996-common: Remove more unneeded camera blobs. * According to LineageOS/android_device_xiaomi_msm8996-common@d6dbf9ceef94f22eafc0776a595d25c2ff8171ae we don't need these blobs with a HAL camera built from the source. --- proprietary-files.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 3004bc5..f1039db 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -69,7 +69,6 @@ vendor/lib/libbtnv.so # Camera lib/libtrueportrait.so vendor/bin/mm-qcamera-daemon|0ffe963b560222f52e65084cd9de455656a7bc11 -vendor/lib/libarcsoft_beautyshot.so vendor/lib/libchromaflash.so vendor/lib/libflash_pmic.so vendor/lib/libjpegdhw.so @@ -119,7 +118,6 @@ vendor/lib/libmmcamera2_stats_modules.so vendor/lib/libmmjpeg.so vendor/lib/libmmqjpeg_codec.so vendor/lib/libmmqjpegdma.so -vendor/lib/libmorpho_image_stab4.so vendor/lib/libmpbase.so vendor/lib/liboptizoom.so vendor/lib/libqomx_jpegdec.so -- cgit v1.2.3 From c3e3a1b9a61d6edcbbd3ffd92c507059021c59d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sat, 3 Mar 2018 13:26:27 +0100 Subject: msm8996-common: config.fs: set vendor for wcnss_filter and cnss-daemon. --- config.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.fs b/config.fs index cdb02c0..fc8335b 100644 --- a/config.fs +++ b/config.fs @@ -1,13 +1,13 @@ [AID_QTI_DIAG] value:2901 -[system/bin/wcnss_filter] +[vendor/bin/wcnss_filter] mode: 0755 user: AID_BLUETOOTH group: AID_BLUETOOTH caps: BLOCK_SUSPEND -[system/bin/cnss-daemon] +[vendor/bin/cnss-daemon] mode: 0755 user: AID_BLUETOOTH group: AID_BLUETOOTH -- cgit v1.2.3 From bb6a981bd55e4ced44afe709aadfc4d7f41dac76 Mon Sep 17 00:00:00 2001 From: davidevinavil Date: Thu, 15 Feb 2018 23:48:36 +0100 Subject: media_profiles.xml: Increase max bith depth and sample rate for audio encoder --- configs/media_profiles_V1_0.xml | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/configs/media_profiles_V1_0.xml b/configs/media_profiles_V1_0.xml index cbac453..80aa065 100644 --- a/configs/media_profiles_V1_0.xml +++ b/configs/media_profiles_V1_0.xml @@ -44,8 +44,8 @@ frameRate="30" /> + + android.hardware.cas + hwbinder + 1.0 + + IMediaCasService + default + + android.hardware.configstore hwbinder @@ -56,15 +65,16 @@ android.hardware.drm hwbinder - 1.0 ICryptoFactory default + widevine IDrmFactory default + widevine @@ -83,6 +93,7 @@ IGnss default + gnss_vendor @@ -240,6 +251,15 @@ default + + android.hardware.usb + hwbinder + 1.0 + + IUsb + default + + android.hardware.vibrator hwbinder @@ -268,30 +288,30 @@ - com.quicinc.cne.api + com.qualcomm.qti.imscmservice hwbinder 1.0 - IApiService - cnd + IImsCmService + qti.ims.connectionmanagerservice - com.quicinc.cne.server + com.qualcomm.qti.uceservice hwbinder 1.0 - IServer - cnd + IUceService + com.qualcomm.qti.uceservice - vendor.qti.hardware.qdutils_disp + com.quicinc.cne.api hwbinder 1.0 - IQdutilsDisp - default + IApiService + cnd @@ -367,12 +387,12 @@ - com.qualcomm.qti.imscmservice + vendor.qti.hardware.qdutils_disp hwbinder 1.0 - IImsCmService - qti.ims.connectionmanagerservice + IQdutilsDisp + default @@ -385,25 +405,6 @@ slot2 - - vendor.qti.hardware.radio.atcmdfwd - hwbinder - 1.0 - - IAtCmdFwd - AtCmdFwdService - - - - vendor.qti.hardware.radio.config - hwbinder - 1.0 - - IConfig - radioconfig0 - radioconfig1 - - vendor.qti.hardware.radio.ims hwbinder @@ -421,7 +422,6 @@ IUimLpa UimLpa0 - UimLpa1 @@ -483,7 +483,4 @@ imsrtpservice - - 26.0 - -- cgit v1.2.3 From 24ca9e1a32428aa3fe1edec04e4b645177a86ef4 Mon Sep 17 00:00:00 2001 From: davidevinavil Date: Sun, 4 Mar 2018 13:37:59 +0100 Subject: wifi: Build readmac --- msm8996.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/msm8996.mk b/msm8996.mk index 5e53595..97df795 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -373,6 +373,7 @@ PRODUCT_PACKAGES += \ libqsap_sdk \ libQWiFiSoftApCfg \ libwifi-hal-qcom \ + readmac \ wpa_supplicant \ wpa_supplicant.conf -- cgit v1.2.3 From 6228386b904ec8d4b5af8b8ab02d104ffb1ec817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 4 Mar 2018 00:32:32 +0100 Subject: msm8996-common: gps.conf is a file. Not a package. --- msm8996.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msm8996.mk b/msm8996.mk index 97df795..6690d54 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -198,12 +198,12 @@ PRODUCT_PACKAGES += \ android.hardware.gnss@1.0-impl-qti \ android.hardware.gnss@1.0-service-qti \ libcurl \ - gps.conf \ libgnss \ libgnsspps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/gps/etc/flp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/flp.conf \ + $(LOCAL_PATH)/gps/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ $(LOCAL_PATH)/gps/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \ $(LOCAL_PATH)/gps/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \ $(LOCAL_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ -- cgit v1.2.3 From 7d10229e40e095bf46bebea08c5cbb0c1f887928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 4 Mar 2018 00:47:03 +0100 Subject: msm8996-common: init.qcom.sensors.sh no longer exists. --- msm8996.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/msm8996.mk b/msm8996.mk index 6690d54..0c3dac5 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -146,8 +146,7 @@ PRODUCT_PACKAGES += \ init.qcom.usb.rc \ init.qcom.usb.sh \ init.qcom.bt.sh \ - ueventd.qcom.rc \ - init.qcom.sensors.sh + ueventd.qcom.rc # Display PRODUCT_PACKAGES += \ -- cgit v1.2.3