diff options
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | manifest.xml | 2 | ||||
| -rwxr-xr-x | msm8996.mk | 2 | ||||
| -rw-r--r-- | proprietary-files.txt | 10 | ||||
| -rw-r--r-- | sepolicy/hal_power_default.te | 2 |
6 files changed, 13 insertions, 15 deletions
@@ -120,16 +120,6 @@ $(RFS_MSM_SLPI_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) -QCACLD_IMAGES := otp30.bin qwlan30.bin utf30.bin -QCACLD_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(QCACLD_IMAGES))) -$(QCACLD_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "QCACLD firmware link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /firmware/image/$(notdir $@) $@ - -ALL_DEFAULT_INSTALLED_MODULES += $(CPE_SYMLINKS) - WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini $(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE) @echo "WCNSS config ini link: $@" diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 8b65e93..4da7e64 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -164,7 +164,7 @@ TARGET_COPY_OUT_VENDOR := vendor TARGET_USES_MKE2FS := true # Power -TARGET_HAS_NO_WIFI_STATS := true +TARGET_WLAN_POWER_STAT := "/d/wlan_wcnss/power_stats" TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on" TARGET_USES_INTERACTION_BOOST := true diff --git a/manifest.xml b/manifest.xml index d957f13..04c67f8 100644 --- a/manifest.xml +++ b/manifest.xml @@ -175,7 +175,7 @@ <hal format="hidl"> <name>android.hardware.power</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.1</version> <interface> <name>IPower</name> <instance>default</instance> @@ -301,7 +301,7 @@ PRODUCT_PACKAGES += \ # Power PRODUCT_PACKAGES += \ - android.hardware.power@1.0-service-qti + android.hardware.power@1.1-service-qti PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index ee5b5a9..9971b0d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -704,8 +704,14 @@ vendor/lib/libwvhidl.so|f7288f7a7ed6765bd1d80d639a0aeb0c31eda795 # WiFi - from bardock-pro - OPM1.171019.019 vendor/bin/cnss-daemon|86c5c02b1bd6edfe60831d72a342f9d30039e238 -# WiFi firmware -etc/firmware/bdwlan30.bin:vendor/firmware/bdwlan30.bin +# WiFi firmware - from marlin - OPM4.171019.021.P1 +vendor/firmware/bdwlan30.b80|ecaab9a00454eeafdb9c3ca226ead0113b14227a +vendor/firmware/bdwlan30.b81|da39a3ee5e6b4b0d3255bfef95601890afd80709 +vendor/firmware/bdwlan30.b82|f1fa441d1516eca65fb487f4dd2b3a7b9ac1d25e +vendor/firmware/bdwlan30.bin|4f34babefcd27ef9108accd7d59577f51cbc2fd0 +vendor/firmware/otp30.bin|6d71901049ac25f584d3bf7b9b612a54b9fa9049 +vendor/firmware/qwlan30.bin|154694cdd9ab88c2a29006cd24f5050ec792f860 +vendor/firmware/utf30.bin|3b56fc92ef03295171b8b973d2d02eed18f5aa62 # HIDL - Dummy HIDL base blob for compatibility with older blobs on GSI ROMs. vendor/lib/android.hidl.base@1.0.so|7b695c37dd8f7edde1b3c8b25c46d7b73232e75b diff --git a/sepolicy/hal_power_default.te b/sepolicy/hal_power_default.te index a6a4cec..23173fb 100644 --- a/sepolicy/hal_power_default.te +++ b/sepolicy/hal_power_default.te @@ -1 +1,3 @@ allow hal_power_default sysfs:file rw_file_perms; +allow hal_power_default debugfs_wlan:dir search; +allow hal_power_default debugfs_wlan:file r_file_perms; |