From d63e08b94f68bfc5656cf8bcdf9a6f37e09d90a7 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 10 Aug 2020 14:13:23 +0000 Subject: [PATCH] begonia: power: Drop building power hidls - We use prebuilt stack - Also rearrange power related proprietary files Signed-off-by: Aayush Gupta --- device.mk | 5 ---- proprietary-files.txt | 56 ++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/device.mk b/device.mk index 11dbd2b..9d132a2 100644 --- a/device.mk +++ b/device.mk @@ -198,11 +198,6 @@ PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/nfc/sn100u_pnx_pcv.pnscr:$(TARGET_COPY_OUT_VENDOR)/etc/sn100u_pnx_pcv.pnscr \ $(DEVICE_PATH)/nfc/sn100u_pnx_sst.pnscr:$(TARGET_COPY_OUT_VENDOR)/etc/sn100u_pnx_sst.pnscr -# Power -PRODUCT_PACKAGES += \ - android.hardware.power@1.1-impl \ - android.hardware.power@1.2-impl - # Permissions PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/permissions/privapp-permissions-mediatek.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-mediatek.xml \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 94d7f54..c16b19a 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -872,7 +872,6 @@ vendor/bin/hw/vendor.mediatek.hardware.keyinstall@1.0-service vendor/bin/hw/vendor.mediatek.hardware.log@1.0-service vendor/bin/hw/vendor.mediatek.hardware.mms@1.3-service vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service -vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service vendor/etc/init/android.hardware.audio@5.0-service-mediatek.rc @@ -886,8 +885,6 @@ vendor/etc/init/vendor.mediatek.hardware.keyinstall@1.0-service.rc vendor/etc/init/vendor.mediatek.hardware.log@1.0-service.rc vendor/etc/init/vendor.mediatek.hardware.mms@1.3-service.rc vendor/etc/init/vendor.mediatek.hardware.mtkcodecservice@1.1-service.rc -vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-init.rc -vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-service.rc vendor/etc/init/vendor.mediatek.hardware.nvram@1.1-sevice.rc vendor/etc/init/vendor.mediatek.hardware.pq@2.2-service.rc vendor/etc/media_codecs_mediatek_audio.xml @@ -895,7 +892,6 @@ vendor/etc/media_codecs_mediatek_video.xml vendor/etc/permissions/com.mediatek.hardware.vow.xml vendor/etc/vintf/manifest/vendor.mediatek.hardware.dplanner@2.0-service.xml vendor/lib/hw/android.hardware.audio@5.0-impl-mediatek.so -vendor/lib/hw/android.hardware.power@1.3-impl-mediatek.so vendor/lib/hw/vendor.mediatek.hardware.camera.atms@1.0-impl.so vendor/lib/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so vendor/lib/hw/vendor.mediatek.hardware.camera.postproc@1.0-impl.so @@ -903,9 +899,7 @@ vendor/lib/hw/vendor.mediatek.hardware.dfps@1.0-impl.so vendor/lib/hw/vendor.mediatek.hardware.keyinstall@1.0-impl.so vendor/lib/hw/vendor.mediatek.hardware.mms@1.3-impl.so vendor/lib/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-impl.so -vendor/lib/hw/vendor.mediatek.hardware.mtkpower@1.0-impl.so vendor/lib/hw/vendor.mediatek.hardware.nvram@1.1-impl.so -vendor/lib/hw/vendor.mediatek.hardware.power@2.1-impl.so vendor/lib/hw/vendor.mediatek.hardware.pq@2.3-impl.so vendor/lib/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so vendor/lib/libmtkares.so @@ -963,12 +957,9 @@ vendor/lib/vendor.mediatek.hardware.mms@1.1.so vendor/lib/vendor.mediatek.hardware.mms@1.2.so vendor/lib/vendor.mediatek.hardware.mms@1.3.so vendor/lib/vendor.mediatek.hardware.mtkcodecservice@1.1.so -vendor/lib/vendor.mediatek.hardware.mtkpower@1.0.so vendor/lib/vendor.mediatek.hardware.netdagent@1.0.so vendor/lib/vendor.mediatek.hardware.nvram@1.0.so vendor/lib/vendor.mediatek.hardware.nvram@1.1.so -vendor/lib/vendor.mediatek.hardware.power@2.0.so -vendor/lib/vendor.mediatek.hardware.power@2.1.so vendor/lib/vendor.mediatek.hardware.pq@2.0.so vendor/lib/vendor.mediatek.hardware.pq@2.1.so vendor/lib/vendor.mediatek.hardware.pq@2.2.so @@ -976,7 +967,6 @@ vendor/lib/vendor.mediatek.hardware.pq@2.3.so vendor/lib/vendor.mediatek.hardware.videotelephony@1.0.so vendor/lib64/hw/android.hardware.audio@5.0-impl-mediatek.so vendor/lib64/hw/android.hardware.camera.provider@2.4-impl-mediatek.so -vendor/lib64/hw/android.hardware.power@1.3-impl-mediatek.so vendor/lib64/hw/android.hardware.sensors@1.0-impl-mediatek.so vendor/lib64/hw/vendor.mediatek.hardware.camera.atms@1.0-impl.so vendor/lib64/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so @@ -987,9 +977,7 @@ vendor/lib64/hw/vendor.mediatek.hardware.dfps@1.0-impl.so vendor/lib64/hw/vendor.mediatek.hardware.keyinstall@1.0-impl.so vendor/lib64/hw/vendor.mediatek.hardware.mms@1.3-impl.so vendor/lib64/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-impl.so -vendor/lib64/hw/vendor.mediatek.hardware.mtkpower@1.0-impl.so vendor/lib64/hw/vendor.mediatek.hardware.nvram@1.1-impl.so -vendor/lib64/hw/vendor.mediatek.hardware.power@2.1-impl.so vendor/lib64/hw/vendor.mediatek.hardware.pq@2.3-impl.so vendor/lib64/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so vendor/lib64/libmtk-ril.so @@ -1094,7 +1082,6 @@ vendor/lib64/vendor.mediatek.hardware.mms@1.1.so vendor/lib64/vendor.mediatek.hardware.mms@1.2.so vendor/lib64/vendor.mediatek.hardware.mms@1.3.so vendor/lib64/vendor.mediatek.hardware.mtkcodecservice@1.1.so -vendor/lib64/vendor.mediatek.hardware.mtkpower@1.0.so vendor/lib64/vendor.mediatek.hardware.mtkradioex@1.0.so vendor/lib64/vendor.mediatek.hardware.mtkradioex@1.1.so vendor/lib64/vendor.mediatek.hardware.mtkradioex@1.2.so @@ -1106,9 +1093,6 @@ vendor/lib64/vendor.mediatek.hardware.neuropilot@1.0.so vendor/lib64/vendor.mediatek.hardware.neuropilot@1.1.so vendor/lib64/vendor.mediatek.hardware.nvram@1.0.so vendor/lib64/vendor.mediatek.hardware.nvram@1.1.so -vendor/lib64/vendor.mediatek.hardware.power@1.1.so -vendor/lib64/vendor.mediatek.hardware.power@2.0.so -vendor/lib64/vendor.mediatek.hardware.power@2.1.so vendor/lib64/vendor.mediatek.hardware.pq@2.0.so vendor/lib64/vendor.mediatek.hardware.pq@2.1.so vendor/lib64/vendor.mediatek.hardware.pq@2.2.so @@ -1227,14 +1211,45 @@ vendor/bin/hw/android.hardware.neuralnetworks@1.1-service-neuron-ann vendor/etc/init/android.hardware.neuralnetworks@1.1-service-gpunn.rc vendor/etc/init/android.hardware.neuralnetworks@1.1-service-neuron-ann.rc -# Power-Hardware +# Power (Hardware) vendor/bin/hw/power_legacy_test_v_1_0 vendor/bin/hw/power_native_test_v_1_0 +vendor/etc/powercontable.xml +vendor/etc/powerscntbl.xml +vendor/etc/power_whitelist_cfg.xml vendor/lib/hw/power.default.so vendor/lib/hw/power.mt6785.so vendor/lib64/hw/power.default.so vendor/lib64/hw/power.mt6785.so +# Power (Interfaces - mtkpower) +vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service +vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-init.rc +vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-service.rc +vendor/lib/hw/vendor.mediatek.hardware.mtkpower@1.0-impl.so +vendor/lib/vendor.mediatek.hardware.mtkpower@1.0.so +vendor/lib64/hw/vendor.mediatek.hardware.mtkpower@1.0-impl.so +vendor/lib64/vendor.mediatek.hardware.mtkpower@1.0.so + +# Power (Interfaces - android) +vendor/lib/hw/android.hardware.power@1.3-impl-mediatek.so +vendor/lib64/hw/android.hardware.power@1.3-impl-mediatek.so + +# Power (Interfaces - vendor.mediatek) +vendor/lib/hw/vendor.mediatek.hardware.power@2.1-impl.so +vendor/lib/vendor.mediatek.hardware.power@2.0.so +vendor/lib/vendor.mediatek.hardware.power@2.1.so +vendor/lib64/hw/vendor.mediatek.hardware.power@2.1-impl.so +vendor/lib64/vendor.mediatek.hardware.power@1.1.so +vendor/lib64/vendor.mediatek.hardware.power@2.0.so +vendor/lib64/vendor.mediatek.hardware.power@2.1.so + +# Power (Libraries) +vendor/lib/libpowerhal.so +vendor/lib/libpowerhalwrap_vendor.so +vendor/lib64/libpowerhal.so +vendor/lib64/libpowerhalwrap_vendor.so + # Radio vendor/lib/libvsim.so @@ -1723,9 +1738,6 @@ vendor/etc/mpe.conf vendor/etc/mtk_omx_core.cfg vendor/etc/pdc.txt vendor/etc/pm_test_item_config.xml -vendor/etc/powercontable.xml -vendor/etc/powerscntbl.xml -vendor/etc/power_whitelist_cfg.xml vendor/etc/screen_light.xml vendor/etc/security/cacerts/00673b5b.0 vendor/etc/security/cacerts/04f60c28.0 @@ -2079,8 +2091,6 @@ vendor/lib/libnvram_sec.so vendor/lib/libopus.so vendor/lib/libperfctl_vendor.so vendor/lib/libpixelflinger.so -vendor/lib/libpowerhal.so -vendor/lib/libpowerhalwrap_vendor.so vendor/lib/libpq_cust_base.so vendor/lib/libpq_prot.so vendor/lib/librgbwlightsensor.so @@ -2285,8 +2295,6 @@ vendor/lib64/libnvram_platform.so vendor/lib64/libnvram_sec.so vendor/lib64/libperfctl_vendor.so vendor/lib64/libpixelflinger.so -vendor/lib64/libpowerhal.so -vendor/lib64/libpowerhalwrap_vendor.so vendor/lib64/libpq_cust_base.so vendor/lib64/libpq_prot.so vendor/lib64/libratconfig.so