From 4f316a79a8a91bf8005fb51e7c033cbd04864c57 Mon Sep 17 00:00:00 2001 From: Shaikh Shadul Date: Tue, 13 Jun 2017 20:45:39 +0530 Subject: [PATCH 1/6] sdm660_64: Use android build variable to copy sensors hals conf Use android build variable in path to specify partition for copying sensors hals conf file. Change-Id: Iced1c2ee57f4f12a11c8440a13491b986b569080 --- sdm660_64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index 449cc90d..716c03ff 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -115,7 +115,7 @@ PRODUCT_PACKAGES += android.hardware.media.omx@1.0-impl # Sensor HAL conf file PRODUCT_COPY_FILES += \ - device/qcom/sdm660_64/sensors/hals.conf:vendor/etc/sensors/hals.conf + device/qcom/sdm660_64/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf # WLAN host driver ifneq ($(WLAN_CHIPSET),) From 7ef6bbde611201c3c515d871d74ce70ef703399c Mon Sep 17 00:00:00 2001 From: Uma Mehta Date: Fri, 16 Jun 2017 16:30:11 +0530 Subject: [PATCH 2/6] sdm660_64: update name of media profiles xml update the name of the media profiles xml to match the name of the file queried by the media profiles header file Change-Id: I472d8f0f94a55fd76e99a2b55410e38b4607527e --- sdm660_64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index 449cc90d..9e4885db 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -40,7 +40,7 @@ TARGET_USE_UI_SVA := true ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true) PRODUCT_COPY_FILES += \ device/qcom/sdm660_64/media_profiles.xml:system/etc/media_profiles.xml \ - device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ + device/qcom/sdm660_64/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ device/qcom/sdm660_64/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ device/qcom/sdm660_64/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS From c011534385002dcdc744d491f2e87ae7141180e8 Mon Sep 17 00:00:00 2001 From: Chaitanya Saggurthi Date: Mon, 19 Jun 2017 19:52:10 +0530 Subject: [PATCH 3/6] radio: move radio hals to one place and follow name conventions All vendor hals are moved to the centralized location and follow the name conventions. The radio hal hidl definitions are updated. Change-Id: I068c038157f7c4a043df75559423f35e653e84b6 CRs-Fixed: 2055157 --- vintf.xml | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/vintf.xml b/vintf.xml index 513ef460..5555d184 100644 --- a/vintf.xml +++ b/vintf.xml @@ -230,9 +230,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - vendor.qti.qcril.am + vendor.qti.hardware.radio.am hwbinder - 1.0 IQcRilAudio @@ -253,9 +252,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - vendor.qti.atcmdfwd + vendor.qti.hardware.radio.atcmdfwd hwbinder - 1.0 IAtCmdFwd @@ -296,4 +294,45 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. imsrtpservice + + vendor.qti.hardware.radio.qtiradio + hwbinder + + 1.0 + + IQtiRadio + slot1 + slot2 + + + + vendor.qti.hardware.radio.ims + hwbinder + 1.0 + + IImsRadio + imsradio0 + imsradio1 + + + + vendor.qti.hardware.radio.qcrilhook + hwbinder + 1.0 + + IQtiOemHook + oemhook0 + oemhook1 + + + + vendor.qti.hardware.radio.config + hwbinder + 1.0 + + IConfig + radioconfig0 + radioconfig1 + + From 7b8ce9528e2ff65aa4f2c0370fe92c2c544b1861 Mon Sep 17 00:00:00 2001 From: padarshr Date: Tue, 20 Jun 2017 19:43:41 +0530 Subject: [PATCH 4/6] Deprecate init.target.vendor.rc script file. Removing init.target.vendor.rc script file as it is no longer needed. Any init service definitions, triggers that need to go into vendor can be placed in init.target.rc(which now resides on vendor). Change-Id: I20bcd1b4ec49231973714982bbd317622c52ef8c --- AndroidBoard.mk | 8 ------ init.target.vendor.rc | 59 ------------------------------------------- 2 files changed, 67 deletions(-) delete mode 100644 init.target.vendor.rc diff --git a/AndroidBoard.mk b/AndroidBoard.mk index e3c85350..80783bae 100755 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -53,14 +53,6 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := init.target.vendor.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := gpio-keys.kl LOCAL_MODULE_TAGS := optional eng diff --git a/init.target.vendor.rc b/init.target.vendor.rc deleted file mode 100644 index 192e0050..00000000 --- a/init.target.vendor.rc +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 2017, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -################################################################################################ -# This init.target.vendor.rc script is similar to init.target.rc, but is intended to contain # -# target specific vendor service definitions, triggers etc. This goes into /vendor/etc/init. # -################################################################################################ - -on early-init - # Add on early-init events here - -on init - # Add on init events here - -on late-init - # Add on late-init events here - -on fs - # Add on fs events here - -on post-fs - # Add on post-fs events here - -on post-fs-data - # Add on post-fs-data events here - -on early-boot - # Add on early-boot events here - -on boot - # Add on boot events here - - -# Add target specific vendor service definitions, triggers from here on. - From 9a57acb3e4c5b257de43126229c6f6dd4ae393bb Mon Sep 17 00:00:00 2001 From: Nitin Shivpure Date: Wed, 14 Jun 2017 14:51:01 +0530 Subject: [PATCH 5/6] FM: Add support to compile FM for sdm660_64 - Add support to compile FM for sdm660_64. - Add FM hal entry in vinf(vendor interface). CRs-fixed: 2061090 Change-Id: I51090200dfa58a563cfffdb56ab89f2c2dcfe3a9 --- sdm660_64.mk | 2 +- vintf.xml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdm660_64.mk b/sdm660_64.mk index 5d73a614..d1afa72c 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -22,7 +22,7 @@ TARGET_DISABLE_DASH := true TARGET_KERNEL_VERSION := 4.4 BOARD_FRP_PARTITION_NAME := frp -BOARD_HAVE_QCOM_FM := false +BOARD_HAVE_QCOM_FM := true TARGET_USES_NQ_NFC := false ifeq ($(TARGET_USES_NQ_NFC),true) diff --git a/vintf.xml b/vintf.xml index 5555d184..59c33bb7 100644 --- a/vintf.xml +++ b/vintf.xml @@ -335,4 +335,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. radioconfig1 + + + + vendor.qti.hardware.fm + hwbinder + 1.0 + + IFmHci + default + + From 8fab3b6947844f428e61b4da28fecd9fcad24a49 Mon Sep 17 00:00:00 2001 From: Nivedita Sarkar Date: Thu, 22 Jun 2017 17:32:41 -0700 Subject: [PATCH 6/6] ims-vt: rtpservice name is modified Change-Id: I6e4c27b5354d4b09636f002150cb0097aa767f9f --- vintf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vintf.xml b/vintf.xml index 5555d184..46e6e060 100644 --- a/vintf.xml +++ b/vintf.xml @@ -285,7 +285,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - com.qualcomm.qti.imsrtpservice + vendor.qti.imsrtpservice hwbinder 1.0