From 3e671e17958a413c149cb8518e7adbed4c56fb28 Mon Sep 17 00:00:00 2001 From: Anurudh Kumar Tiwari Date: Mon, 12 Jun 2017 18:14:14 +0530 Subject: SDM660_64 : Enabling full treble on SDM660 Change-Id: I2d05369b5d945a575fb6d493faf22d2d90519058 --- AndroidBoard.mk | 6 +- BoardConfig.mk | 1 + init.qti.qseecomd.sh | 2 +- init.target.rc | 34 +++---- sdm660_64.mk | 8 +- vintf.xml | 251 ++++++++++++++++++++++++++++++++++----------------- 6 files changed, 196 insertions(+), 106 deletions(-) diff --git a/AndroidBoard.mk b/AndroidBoard.mk index e3c8535..5282668 100755 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -50,7 +50,7 @@ LOCAL_MODULE := init.target.rc LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init/hw include $(BUILD_PREBUILT) include $(CLEAR_VARS) @@ -74,9 +74,9 @@ LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) ifeq ($(ENABLE_VENDOR_IMAGE), true) -LOCAL_POST_INSTALL_CMD := echo $(VENDOR_FSTAB_ENTRY) >> $(TARGET_ROOT_OUT)/$(LOCAL_MODULE) +LOCAL_POST_INSTALL_CMD := echo $(VENDOR_FSTAB_ENTRY) >> $(LOCAL_MODULE_PATH)/$(LOCAL_MODULE) endif include $(BUILD_PREBUILT) diff --git a/BoardConfig.mk b/BoardConfig.mk index 76a4443..5c758c4 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -73,6 +73,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 838860800 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR := vendor VENDOR_FSTAB_ENTRY := "/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,verify" +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true endif # Enable suspend during charger mode diff --git a/init.qti.qseecomd.sh b/init.qti.qseecomd.sh index 9d14ea2..f1c725c 100755 --- a/init.qti.qseecomd.sh +++ b/init.qti.qseecomd.sh @@ -1,4 +1,4 @@ -#!/system/bin/sh +#!/vendor/bin/sh # Copyright (c) 2016, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/init.target.rc b/init.target.rc index debfccb..cc76001 100755 --- a/init.target.rc +++ b/init.target.rc @@ -40,8 +40,8 @@ on init on fs wait /dev/block/bootdevice - mount_all fstab.qcom - swapon_all fstab.qcom + mount_all /vendor/etc/fstab.qcom + swapon_all /vendor/etc/fstab.qcom # Keeping following partitions outside fstab file. As user may not have # these partition flashed on the device. Failure to mount any partition in fstab file @@ -156,7 +156,7 @@ service qseecomd /vendor/bin/qseecomd user root group root -#service mpdecision /system/bin/mpdecision --avg_comp +#service mpdecision /system/vendor/bin/mpdecision --avg_comp # user root # disabled # @@ -182,12 +182,12 @@ service thermal-engine /system/vendor/bin/thermal-engine # class core # oneshot # -service time_daemon /system/bin/time_daemon +service time_daemon /system/vendor/bin/time_daemon class late_start user root group root -service adsprpcd /system/bin/adsprpcd audiopd +service adsprpcd /system/vendor/bin/adsprpcd audiopd class main user media group media @@ -198,49 +198,49 @@ service hbtp /system/vendor/bin/hbtp_daemon group system disabled -service audiod /system/bin/audiod +service audiod /system/vendor/bin/audiod class late_start user system group system # -#service usf_tester /system/bin/usf_tester +#service usf_tester /system/vendor/bin/usf_tester # user system # group system inet # disabled # -#service usf_epos /system/bin/usf_epos +#service usf_epos /system/vendor/bin/usf_epos # user system # group system inet # disabled # -#service usf_gesture /system/bin/usf_gesture +#service usf_gesture /system/vendor/bin/usf_gesture # user system # group system inet # disabled # -#service usf_sync_gesture /system/bin/usf_sync_gesture +#service usf_sync_gesture /system/vendor/bin/usf_sync_gesture # user system # group system inet # disabled # -#service usf_p2p /system/bin/usf_p2p +#service usf_p2p /system/vendor/bin/usf_p2p # user system # group system inet # disabled # -#service usf_hovering /system/bin/usf_hovering +#service usf_hovering /system/vendor/bin/usf_hovering # user system # group system inet # disabled # -#service usf_proximity /system/bin/usf_proximity +#service usf_proximity /system/vendor/bin/usf_proximity # user system # group system inet # disabled # -#service usf-post-boot /system/bin/sh /system/etc/usf_post_boot.sh +#service usf-post-boot /system/vendor/bin/sh /system/etc/usf_post_boot.sh # class late_start # user root # disabled @@ -318,7 +318,7 @@ service imsdatadaemon /system/vendor/bin/imsdatadaemon # class core # oneshot -service energy-awareness /system/bin/energy-awareness +service energy-awareness /system/vendor/bin/energy-awareness class main user system group system @@ -402,7 +402,7 @@ on charger # user system # group drmrpc # -#service adsprpcd /system/bin/adsprpcd +#service adsprpcd /system/vendor/bin/adsprpcd # class main # user media # group media @@ -414,7 +414,7 @@ on charger # user system # group system -service seempd /system/bin/seempd +service seempd /system/vendor/bin/seempd class late_start user system group system sdcard_rw diff --git a/sdm660_64.mk b/sdm660_64.mk index 449cc90..62b4b56 100644 --- a/sdm660_64.mk +++ b/sdm660_64.mk @@ -149,7 +149,8 @@ PRODUCT_PACKAGES += \ android.hardware.memtrack@1.0-service \ android.hardware.light@2.0-impl \ android.hardware.light@2.0-service \ - android.hardware.configstore@1.0-service + android.hardware.configstore@1.0-service \ + android.hardware.broadcastradio@1.0-impl PRODUCT_PACKAGES += \ vendor.display.color@1.0-service \ @@ -199,6 +200,8 @@ ifeq ($(ENABLE_VENDOR_IMAGE), true) PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor endif +PRODUCT_FULL_TREBLE_OVERRIDE := true + #for android_filesystem_config.h PRODUCT_PACKAGES += \ fs_config_files @@ -249,6 +252,3 @@ PRODUCT_PACKAGES += android.hardware.health@1.0-impl \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:system/etc/permissions/android.hardware.opengles.aep.xml -#Enable keymaster Impl HAL Compilation -PRODUCT_PACKAGES += android.hardware.keymaster@3.0-impl - diff --git a/vintf.xml b/vintf.xml index 513ef46..9649424 100644 --- a/vintf.xml +++ b/vintf.xml @@ -25,40 +25,37 @@ 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. --> - + android.hardware.audio hwbinder - 2.0 + + IDevicesFactory + default + android.hardware.audio.effect hwbinder - 2.0 + + IEffectsFactory + default + android.hardware.soundtrigger hwbinder - 2.0 ISoundTriggerHw - sound_trigger.primary + default - - - android.hardware.media - hwbinder - - 1.0 - android.hardware.media.omx hwbinder - 1.0 IOmx @@ -69,12 +66,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - android.hardware.graphics.allocator hwbinder - 2.0 IAllocator @@ -84,7 +78,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android.hardware.graphics.mapper passthrough - 2.0 IMapper @@ -94,7 +87,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android.hardware.graphics.composer hwbinder - 2.1 IComposer @@ -104,7 +96,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. vendor.display.config hwbinder - 1.0 IDisplayConfig @@ -114,7 +105,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. vendor.display.color hwbinder - 1.0 IDisplayColor @@ -124,7 +114,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android.hardware.configstore hwbinder - 1.0 ISurfaceFlingerConfigs @@ -134,7 +123,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android.hardware.light hwbinder - 2.0 ILight @@ -144,118 +132,140 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android.hardware.memtrack hwbinder - 1.0 IMemtrack default - android.hardware.sensors hwbinder - 1.0 + + ISensors + default + android.hardware.camera.provider - toggled - + hwbinder 2.4 ICameraProvider legacy/0 - android.hardware.bluetooth - hwbinder - + hwbinder 1.0 + + IBluetoothHci + default + com.qualcomm.qti.bluetooth_audio hwbinder - 1.0 IBluetoothAudio default - + + com.qualcomm.qti.ant + hwbinder + 1.0 + + IAntHci + default + + android.hardware.power - passthrough - + hwbinder 1.0 + + IPower + default + android.hardware.boot hwbinder - 1.0 + + IBootControl + default + android.hardware.health hwbinder - 1.0 + + IHealth + default + + + + android.hardware.radio + hwbinder + 1.0 + + IRadio + slot1 + slot2 + + + ISap + slot1 + slot2 + + + + android.hardware.radio.deprecated + hwbinder + 1.0 + + IOemHook + slot1 + slot2 + + + + vendor.qti.qcril.am + hwbinder + 1.0 + + IQcRilAudio + slot1 + slot2 + - - - android.hardware.radio - hwbinder - - 1.0 - - IRadio - slot1 - slot2 - - - - - android.hardware.radio.deprecated - hwbinder - - 1.0 - - IOemHook - slot1 - slot2 - - - - - vendor.qti.qcril.am - hwbinder - - 1.0 - - IQcRilAudio - slot1 - slot2 - - - android.hardware.gnss hwbinder - 1.0 IGnss default - + + vendor.qti.gnss + hwbinder + 1.0 + + IGnssVendor + gnss_vendor + + vendor.qti.atcmdfwd hwbinder - 1.0 IAtCmdFwd @@ -265,7 +275,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android.hardware.vibrator hwbinder - 1.0 IVibrator @@ -273,11 +282,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - com.qualcomm.qti.dpm.api hwbinder - 1.0 IdpmQmi @@ -285,15 +292,97 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - com.qualcomm.qti.imsrtpservice hwbinder - 1.0 IRTPService imsrtpservice + + + + vendor.qti.hardware.perf + hwbinder + 1.0 + + IPerf + default + + + + com.qualcomm.qti.qtiradio + hwbinder + 1.0 + + IQtiRadio + slot1 + slot2 + + + + vendor.qti.hardware.fm + hwbinder + 1.0 + + IFmHci + default + + + + android.hardware.keymaster + hwbinder + 3.0 + + IKeymasterDevice + default + + + + android.hardware.gatekeeper + hwbinder + 1.0 + + IGatekeeper + default + + + + android.hardware.broadcastradio + hwbinder + 1.0 + + IBroadcastRadioFactory + default + + + + android.hardware.wifi.supplicant + hwbinder + 1.0 + + ISupplicant + default + + + + com.qualcomm.qti.ims.radio + hwbinder + 1.0 + + IImsRadio + imsradio0 + + + + com.qualcomm.qti.qcril.qcrilhook + hwbinder + 1.0 + + IQtiOemHook + oemhook0 + oemhook1 + -- cgit v1.2.3