diff options
| -rwxr-xr-x | AndroidBoard.mk | 7 | ||||
| -rwxr-xr-x | BoardConfig.mk | 4 | ||||
| -rwxr-xr-x | init.qti.qseecomd.sh | 2 | ||||
| -rwxr-xr-x | init.target.rc | 34 | ||||
| -rw-r--r-- | sdm660_64.mk | 8 | ||||
| -rwxr-xr-x | system.prop | 3 | ||||
| -rw-r--r-- | vintf.xml | 274 |
7 files changed, 225 insertions, 107 deletions
diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 80783ba..40d413c 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) @@ -66,10 +66,7 @@ LOCAL_MODULE := fstab.qcom LOCAL_MODULE_TAGS := optional eng LOCAL_MODULE_CLASS := ETC LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -ifeq ($(ENABLE_VENDOR_IMAGE), true) -LOCAL_POST_INSTALL_CMD := echo $(VENDOR_FSTAB_ENTRY) >> $(TARGET_ROOT_OUT)/$(LOCAL_MODULE) -endif +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true) diff --git a/BoardConfig.mk b/BoardConfig.mk index 76a4443..3cba75f 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -72,7 +72,7 @@ ifeq ($(ENABLE_VENDOR_IMAGE), true) 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 @@ -92,7 +92,7 @@ ifeq ($(TARGET_KERNEL_VERSION),4.4) else BOARD_KERNEL_CMDLINE += console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 earlycon=msm_hsl_uart,0xc1b0000 endif -BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.selinux=permissive +BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 endif BOARD_EGL_CFG := device/qcom/sdm660_64/egl.cfg 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 57532cc..1df32a7 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 @@ -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 @@ -425,7 +425,7 @@ service tlocd /system/bin/tloc_daemon user system group drmrpc -service hvdcp_opti /system/bin/hvdcp_opti +service hvdcp_opti /system/vendor/bin/hvdcp_opti class main user root group system wakelock diff --git a/sdm660_64.mk b/sdm660_64.mk index d1afa72..92a031b 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/system.prop b/system.prop index 840b0da..e3b0c64 100755 --- a/system.prop +++ b/system.prop @@ -187,3 +187,6 @@ persist.camera.preview.ubwc=0 # Create zram disk ro.config.zram=true + +#set maximum supported adapter voltage +persist.charger.max_voltage_mv=9000 @@ -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. --> -<manifest version="1.0"> +<manifest version="1.0" type="device"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>2.0</version> + <interface> + <name>IDevicesFactory</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>android.hardware.audio.effect</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>2.0</version> + <interface> + <name>IEffectsFactory</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>android.hardware.soundtrigger</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>2.0</version> <interface> <name>ISoundTriggerHw</name> - <instance>sound_trigger.primary</instance> + <instance>default</instance> </interface> </hal> - <!-- video omx hal --> - <hal format="hidl"> - <name>android.hardware.media</name> - <transport>hwbinder</transport> - <impl level="generic"></impl> - <version>1.0</version> - </hal> <hal format="hidl"> <name>android.hardware.media.omx</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IOmx</name> @@ -69,12 +66,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <instance>default</instance> </interface> </hal> - <!-- /video omx hal --> - <!-- display --> <hal format="hidl"> <name>android.hardware.graphics.allocator</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>2.0</version> <interface> <name>IAllocator</name> @@ -84,7 +78,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.graphics.mapper</name> <transport arch="32+64">passthrough</transport> - <impl level="generic"></impl> <version>2.0</version> <interface> <name>IMapper</name> @@ -94,7 +87,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.graphics.composer</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>2.1</version> <interface> <name>IComposer</name> @@ -104,7 +96,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>vendor.display.config</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IDisplayConfig</name> @@ -114,7 +105,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>vendor.display.color</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IDisplayColor</name> @@ -124,7 +114,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.configstore</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>ISurfaceFlingerConfigs</name> @@ -134,7 +123,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.light</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>2.0</version> <interface> <name>ILight</name> @@ -144,113 +132,138 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.memtrack</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IMemtrack</name> <instance>default</instance> </interface> </hal> - <!-- /display --> <hal format="hidl"> <name>android.hardware.sensors</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> + <interface> + <name>ISensors</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>android.hardware.camera.provider</name> - <transport arch="32+64">toggled</transport> - <impl level="generic"></impl> + <transport>hwbinder</transport> <version>2.4</version> <interface> <name>ICameraProvider</name> <instance>legacy/0</instance> </interface> </hal> - <!-- bluetooth --> <hal format="hidl"> <name>android.hardware.bluetooth</name> - <transport arch="32+64">hwbinder</transport> - <impl level="generic"></impl> + <transport>hwbinder</transport> <version>1.0</version> + <interface> + <name>IBluetoothHci</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>com.qualcomm.qti.bluetooth_audio</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IBluetoothAudio</name> <instance>default</instance> </interface> </hal> - <!-- bluetooth --> <hal format="hidl"> - <name>android.hardware.power</name> - <transport arch="32+64">passthrough</transport> + <name>com.qualcomm.qti.ant</name> + <transport>hwbinder</transport> <impl level="generic"></impl> <version>1.0</version> + <interface> + <name>IAntHci</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.power</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IPower</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>android.hardware.boot</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> + <interface> + <name>IBootControl</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>android.hardware.health</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> + <interface> + <name>IHealth</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.radio</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IRadio</name> + <instance>slot1</instance> + <instance>slot2</instance> + </interface> + <interface> + <name>ISap</name> + <instance>slot1</instance> + <instance>slot2</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.radio.deprecated</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IOemHook</name> + <instance>slot1</instance> + <instance>slot2</instance> + </interface> </hal> - <!-- RIL --> - <hal format="hidl"> - <name>android.hardware.radio</name> - <transport>hwbinder</transport> - <impl level="generic"></impl> - <version>1.0</version> - <interface> - <name>IRadio</name> - <instance>slot1</instance> - <instance>slot2</instance> - </interface> - </hal> - <!-- RIL OEM HOOK --> - <hal format="hidl"> - <name>android.hardware.radio.deprecated</name> - <transport>hwbinder</transport> - <impl level="generic"></impl> - <version>1.0</version> - <interface> - <name>IOemHook</name> - <instance>slot1</instance> - <instance>slot2</instance> - </interface> - </hal> - <!-- RIL AUDIO HAL --> - <hal format="hidl"> + <hal format="hidl"> <name>vendor.qti.hardware.radio.am</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IQcRilAudio</name> - <instance>slot1</instance> - <instance>slot2</instance> - </interface> - </hal> - <!-- gnss --> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IQcRilAudio</name> + <instance>slot1</instance> + <instance>slot2</instance> + </interface> + </hal> <hal format="hidl"> <name>android.hardware.gnss</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IGnss</name> <instance>default</instance> </interface> </hal> - <!-- atfwd --> + <hal format="hidl"> + <name>vendor.qti.gnss</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>ILocHidlGnss</name> + <instance>gnss_vendor</instance> + </interface> + </hal> <hal format="hidl"> <name>vendor.qti.hardware.radio.atcmdfwd</name> <transport>hwbinder</transport> @@ -263,7 +276,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <hal format="hidl"> <name>android.hardware.vibrator</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IVibrator</name> @@ -271,11 +283,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </interface> </hal> - <!-- dpm QMI hal service --> <hal format="hidl"> <name>com.qualcomm.qti.dpm.api</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IdpmQmi</name> @@ -283,16 +293,124 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </interface> </hal> - <!-- IMS RTP Service --> <hal format="hidl"> <name>vendor.qti.imsrtpservice</name> <transport>hwbinder</transport> - <impl level="generic"></impl> <version>1.0</version> <interface> <name>IRTPService</name> <instance>imsrtpservice</instance> </interface> + </hal> + + <hal format="hidl"> + <name>vendor.qti.hardware.perf</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IPerf</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>vendor.qti.hardware.radio.qtiradio</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IQtiRadio</name> + <instance>slot1</instance> + <instance>slot2</instance> + </interface> + </hal> + <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> + <hal format="hidl"> + <name>android.hardware.keymaster</name> + <transport>hwbinder</transport> + <impl level="generic"></impl> + <version>3.0</version> + <interface> + <name>IKeymasterDevice</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.gatekeeper</name> + <transport>hwbinder</transport> + <impl level="generic"></impl> + <version>1.0</version> + <interface> + <name>IGatekeeper</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.broadcastradio</name> + <transport>hwbinder</transport> + <impl level="generic"></impl> + <version>1.0</version> + <interface> + <name>IBroadcastRadioFactory</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.wifi.supplicant</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>ISupplicant</name> + <instance>default</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> + + <!-- Alarm HAL service --> + <hal format="hidl"> + <name>vendor.qti.hardware.alarm</name> + <transport>hwbinder</transport> + <impl level="generic"></impl> + <version>1.0</version> + <interface> + <name>IAlarm</name> + <instance>default</instance> + </interface> </hal> <hal format="hidl"> <name>vendor.qti.hardware.radio.qtiradio</name> |