From b2357eaa92fe636b75db3331defce0fcd2131bfa Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Wed, 29 Sep 2021 20:43:03 +0200 Subject: [PATCH] sm7125: Build gatekeeper *And use stock init file Change-Id: I1085816bbda0a4d9c9d369ae1b42a20aeb6fe11d --- common.mk | 8 ++++++++ configs/init/android.hardware.gatekeeper@1.0-service.rc | 8 ++++++++ proprietary-files.txt | 9 ++++----- vendor.prop | 3 +++ 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 configs/init/android.hardware.gatekeeper@1.0-service.rc diff --git a/common.mk b/common.mk index 58386e7..c529674 100644 --- a/common.mk +++ b/common.mk @@ -133,6 +133,14 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ fastbootd +# Gatekeeper +PRODUCT_PACKAGES += \ + android.hardware.gatekeeper@1.0-impl \ + android.hardware.gatekeeper@1.0-service + +PRODUCT_COPY_FILES += \ + $(COMMON_PATH)/configs/init/android.hardware.gatekeeper@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service.rc + # Health PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl \ diff --git a/configs/init/android.hardware.gatekeeper@1.0-service.rc b/configs/init/android.hardware.gatekeeper@1.0-service.rc new file mode 100644 index 0000000..79b7956 --- /dev/null +++ b/configs/init/android.hardware.gatekeeper@1.0-service.rc @@ -0,0 +1,8 @@ +service vendor.gatekeeper-1-0 /vendor/bin/hw/android.hardware.gatekeeper@1.0-service + interface android.hardware.gatekeeper@1.0::IGatekeeper default + class hal + user system + group system 5678 + +on post-fs-data + mkdir /data/vendor/gatekeeper 0770 system system diff --git a/proprietary-files.txt b/proprietary-files.txt index 3fd3a4a..2061c89 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,3 +1,7 @@ +# Gatekeeper +vendor/lib64/hw/gatekeeper.mdfpp.so + + vendor/lib/vendor.qti.hardware.btconfigstore@2.0.so vendor/lib/libcamera2ndk_vendor.so vendor/lib/libsomxflacd.so @@ -604,7 +608,6 @@ vendor/lib/libcdfw.so vendor/lib/vendor.display.config@1.10.so vendor/lib/vendor.qti.hardware.display.mapperextensions@1.0.so vendor/lib/libscveObjectSegmentation.so -vendor/lib/android.hardware.gatekeeper@1.0-impl.so vendor/lib/libOmxAlacDec.so vendor/lib/libloc_core.so vendor/lib/vendor.qti.hardware.perf@2.1.so @@ -917,7 +920,6 @@ vendor/etc/init/android.hardware.dumpstate@1.1-service-lazy.rc vendor/etc/init/android.hardware.graphics.composer@2.4-service.rc vendor/etc/init/init.vendor.onebinary.rc vendor/etc/init/android.hardware.audio.service.rc -vendor/etc/init/android.hardware.gatekeeper@1.0-service.rc vendor/etc/init/vendor.samsung.hardware.security.engmode@1.0-service.rc vendor/etc/init/vendor.qti.tftp.rc vendor/etc/init/vendor.qti.hardware.wifi.wifilearner@1.0-service.rc @@ -1468,7 +1470,6 @@ vendor/lib64/hw/android.hardware.audio@5.0-impl.so vendor/lib64/hw/vendor.samsung.hardware.camera.provider@4.0-impl.so vendor/lib64/hw/audio.sec_primary.default.so vendor/lib64/hw/vendor.samsung.hardware.audio@1.0-impl.so -vendor/lib64/hw/gatekeeper.mdfpp.so vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so vendor/lib64/hw/android.hardware.audio@2.0-impl.so vendor/lib64/hw/audio.r_submix.default.so @@ -1792,7 +1793,6 @@ vendor/lib64/vendor.samsung.hardware.tlc.tima@1.0-impl.so vendor/lib64/vendor.display.config@1.10.so vendor/lib64/vendor.qti.hardware.display.mapperextensions@1.0.so vendor/lib64/libscveObjectSegmentation.so -vendor/lib64/android.hardware.gatekeeper@1.0-impl.so vendor/lib64/libOmxAlacDec.so vendor/lib64/libloc_core.so vendor/lib64/vendor.qti.hardware.perf@2.1.so @@ -2039,7 +2039,6 @@ vendor/bin/hw/vendor.samsung.hardware.hyper-service vendor/bin/hw/vendor.samsung.hardware.light-service vendor/bin/hw/android.hardware.graphics.composer@2.4-service vendor/bin/hw/vendor.samsung.hardware.wifi@2.0-service -vendor/bin/hw/android.hardware.gatekeeper@1.0-service vendor/bin/hw/vendor.qti.hardware.display.allocator-service vendor/bin/hw/vendor.samsung.hardware.camera.provider@4.0-service vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti diff --git a/vendor.prop b/vendor.prop index fd3a227..f2aa2e5 100644 --- a/vendor.prop +++ b/vendor.prop @@ -108,6 +108,9 @@ ro.hardware.vulkan=adreno ro.hardware.egl=adreno ro.opengles.version=196610 +# Gatekeeper +ro.hardware.gatekeeper=mdfpp + # Media debug.stagefright.omx_default_rank=0 debug.stagefright.ccodec=1