diff options
| author | Abhilash Kumar Subhash <asubha@codeaurora.org> | 2017-06-29 01:36:55 +0530 |
|---|---|---|
| committer | Abhilash Kumar Subhash <asubha@codeaurora.org> | 2017-06-29 01:36:55 +0530 |
| commit | 66bd129a6c21c09847cd9a6f49f6aae0d23b0808 (patch) | |
| tree | 4dbf00a09816bed6cb94bc990866716fbd65d693 | |
| parent | d28595c12b1e65a51fddf1e52ff404ad721689ce (diff) | |
| parent | 5ea1cd9f518528a660104ac7585a369b3430f256 (diff) | |
Merge commit '5ea1cd9f518528a660104ac7585a369b3430f256' into remote
Conflicts:
AndroidBoard.mk
vintf.xml
Change-Id: I245be8ee991e9440a8554dbfa89ffad060bfb923
| -rw-r--r-- | sdm660_64.mk | 6 | ||||
| -rw-r--r-- | vintf.xml | 52 |
2 files changed, 55 insertions, 3 deletions
diff --git a/sdm660_64.mk b/sdm660_64.mk index 62b4b56..92a031b 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) @@ -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 @@ -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),) @@ -412,4 +412,56 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <instance>default</instance> </interface> </hal> + <hal format="hidl"> + <name>vendor.qti.hardware.radio.qtiradio</name> + <transport>hwbinder</transport> + <impl level="generic"></impl> + <version>1.0</version> + <interface> + <name>IQtiRadio</name> + <instance>slot1</instance> + <instance>slot2</instance> + </interface> + </hal> + <hal format="hidl"> + <name>vendor.qti.hardware.radio.ims</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IImsRadio</name> + <instance>imsradio0</instance> + <instance>imsradio1</instance> + </interface> + </hal> + <hal format="hidl"> + <name>vendor.qti.hardware.radio.qcrilhook</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IQtiOemHook</name> + <instance>oemhook0</instance> + <instance>oemhook1</instance> + </interface> + </hal> + <hal format="hidl"> + <name>vendor.qti.hardware.radio.config</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IConfig</name> + <instance>radioconfig0</instance> + <instance>radioconfig1</instance> + </interface> + </hal> + + <!-- fm --> + <hal format="hidl"> + <name>vendor.qti.hardware.fm</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IFmHci</name> + <instance>default</instance> + </interface> + </hal> </manifest> |