diff --git a/r8q/Android.bp b/r8q/Android.bp index 705574a..7bbd966 100644 --- a/r8q/Android.bp +++ b/r8q/Android.bp @@ -45,6 +45,23 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libkeymaster_helper", + owner: "samsung", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: ["proprietary/vendor/lib64/libkeymaster_helper.so"], + }, + }, + compile_multilib: "64", + check_elf_files: false, + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libskeymaster4device", owner: "samsung", @@ -178,3 +195,15 @@ prebuilt_etc_xml { soc_specific: true, } +cc_prebuilt_binary { + name: "android.hardware.keymaster@4.0-strongbox-service-qti", + owner: "samsung", + srcs: ["proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-strongbox-service-qti"], + check_elf_files: false, + strip: { + none: true, + }, + prefer: true, + relative_install_path: "hw", + soc_specific: true, +} diff --git a/r8q/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-strongbox-service-qti b/r8q/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-strongbox-service-qti new file mode 100755 index 0000000..61b6a84 Binary files /dev/null and b/r8q/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-strongbox-service-qti differ diff --git a/r8q/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-strongbox-service-qti.rc b/r8q/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-strongbox-service-qti.rc new file mode 100755 index 0000000..fa5ca65 --- /dev/null +++ b/r8q/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-strongbox-service-qti.rc @@ -0,0 +1,7 @@ +on init + start keymaster-sb-4-0 + +service keymaster-sb-4-0 /vendor/bin/hw/android.hardware.keymaster@4.0-strongbox-service-qti + class early_hal + user system + group system drmrpc diff --git a/r8q/proprietary/vendor/lib/libkeymasterdeviceutils.so b/r8q/proprietary/vendor/lib/libkeymasterdeviceutils.so new file mode 100755 index 0000000..9c4d2c6 Binary files /dev/null and b/r8q/proprietary/vendor/lib/libkeymasterdeviceutils.so differ diff --git a/r8q/proprietary/vendor/lib/libkeymasterutils.so b/r8q/proprietary/vendor/lib/libkeymasterutils.so new file mode 100755 index 0000000..4f487a1 Binary files /dev/null and b/r8q/proprietary/vendor/lib/libkeymasterutils.so differ diff --git a/r8q/proprietary/vendor/lib/libqtikeymaster4.so b/r8q/proprietary/vendor/lib/libqtikeymaster4.so new file mode 100755 index 0000000..f28aeba Binary files /dev/null and b/r8q/proprietary/vendor/lib/libqtikeymaster4.so differ diff --git a/r8q/proprietary/vendor/lib/libspcom.so b/r8q/proprietary/vendor/lib/libspcom.so new file mode 100755 index 0000000..d2aa46d Binary files /dev/null and b/r8q/proprietary/vendor/lib/libspcom.so differ diff --git a/r8q/proprietary/vendor/lib64/libkeymasterdeviceutils.so b/r8q/proprietary/vendor/lib64/libkeymasterdeviceutils.so old mode 100644 new mode 100755 diff --git a/r8q/proprietary/vendor/lib64/libkeymasterutils.so b/r8q/proprietary/vendor/lib64/libkeymasterutils.so new file mode 100755 index 0000000..2a6fbc0 Binary files /dev/null and b/r8q/proprietary/vendor/lib64/libkeymasterutils.so differ diff --git a/r8q/proprietary/vendor/lib64/libqtikeymaster4.so b/r8q/proprietary/vendor/lib64/libqtikeymaster4.so new file mode 100755 index 0000000..da308ff Binary files /dev/null and b/r8q/proprietary/vendor/lib64/libqtikeymaster4.so differ diff --git a/r8q/proprietary/vendor/lib64/libspcom.so b/r8q/proprietary/vendor/lib64/libspcom.so old mode 100644 new mode 100755 diff --git a/r8q/r8q-vendor.mk b/r8q/r8q-vendor.mk index b6f7498..cd5065f 100644 --- a/r8q/r8q-vendor.mk +++ b/r8q/r8q-vendor.mk @@ -97,6 +97,7 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \ vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \ vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.health@2.1-service-samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.health@2.1-service-samsung.rc \ + vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-strongbox-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-strongbox-service-qti.rc \ vendor/samsung/r8q/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \ vendor/samsung/r8q/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \ vendor/samsung/r8q/proprietary/vendor/etc/init/fingerprint_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fingerprint_common.rc \ @@ -400,6 +401,8 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/lib/libIDDQD_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib/libIDDQD_interface.so \ vendor/samsung/r8q/proprietary/vendor/lib/libIMUSensor.so:$(TARGET_COPY_OUT_VENDOR)/lib/libIMUSensor.so \ vendor/samsung/r8q/proprietary/vendor/lib/libImageFormatConverter.so:$(TARGET_COPY_OUT_VENDOR)/lib/libImageFormatConverter.so \ + vendor/samsung/r8q/proprietary/vendor/lib/libkeymasterdeviceutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libkeymasterdeviceutils.so \ + vendor/samsung/r8q/proprietary/vendor/lib/libkeymasterutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libkeymasterutils.so \ vendor/samsung/r8q/proprietary/vendor/lib/libLocalTM_capture_core.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib/libLocalTM_capture_core.camera.samsung.so \ vendor/samsung/r8q/proprietary/vendor/lib/libLocalTM_preview_core.so:$(TARGET_COPY_OUT_VENDOR)/lib/libLocalTM_preview_core.so \ vendor/samsung/r8q/proprietary/vendor/lib/libLocalTM_wrapper.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib/libLocalTM_wrapper.camera.samsung.so \ @@ -650,6 +653,7 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/lib/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqrtr.so \ vendor/samsung/r8q/proprietary/vendor/lib/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqseed3.so \ vendor/samsung/r8q/proprietary/vendor/lib/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqsocket.so \ + vendor/samsung/r8q/proprietary/vendor/lib/libqtikeymaster4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtikeymaster4.so \ vendor/samsung/r8q/proprietary/vendor/lib/libqti-iopd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-iopd-client.so \ vendor/samsung/r8q/proprietary/vendor/lib/libqti-iopd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-iopd.so \ vendor/samsung/r8q/proprietary/vendor/lib/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd-client.so \ @@ -717,6 +721,7 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/lib/libsnsdiaglog.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsnsdiaglog.so \ vendor/samsung/r8q/proprietary/vendor/lib/libsocial_image_enhancement.uniplugin@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsocial_image_enhancement.uniplugin@1.0.so \ vendor/samsung/r8q/proprietary/vendor/lib/libspatializerparamstorage.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspatializerparamstorage.so \ + vendor/samsung/r8q/proprietary/vendor/lib/libspcom.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspcom.so \ vendor/samsung/r8q/proprietary/vendor/lib/libspeakercalibration.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspeakercalibration.so \ vendor/samsung/r8q/proprietary/vendor/lib/libspkrprot.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspkrprot.so \ vendor/samsung/r8q/proprietary/vendor/lib/libspl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspl.so \ @@ -1191,8 +1196,8 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/lib64/libjnihelper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjnihelper.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libjpegQtable_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjpegQtable_interface.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libjpegencoder_sw.unifunc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libjpegencoder_sw.unifunc.so \ - vendor/samsung/r8q/proprietary/vendor/lib64/libkeymaster_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymaster_helper.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libkeymasterdeviceutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterdeviceutils.so \ + vendor/samsung/r8q/proprietary/vendor/lib64/libkeymasterutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libkeymasterutils.so \ vendor/samsung/r8q/proprietary/vendor/lib64/liblbs_core.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblbs_core.so \ vendor/samsung/r8q/proprietary/vendor/lib64/liblearningmodule.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblearningmodule.so \ vendor/samsung/r8q/proprietary/vendor/lib64/liblivefocus_capture_engine.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblivefocus_capture_engine.so \ @@ -1272,6 +1277,7 @@ PRODUCT_COPY_FILES += \ vendor/samsung/r8q/proprietary/vendor/lib64/libqrtr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqrtr.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libqseed3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqseed3.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libqsocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqsocket.so \ + vendor/samsung/r8q/proprietary/vendor/lib64/libqtikeymaster4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqtikeymaster4.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libqti-iopd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-iopd-client.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libqti-iopd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-iopd.so \ vendor/samsung/r8q/proprietary/vendor/lib64/libqti-perfd-client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqti-perfd-client.so \ @@ -1492,6 +1498,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ libfastcvopt \ libthermalclient \ + libkeymaster_helper \ libskeymaster4device \ CACertService \ TimeService \ @@ -1500,6 +1507,7 @@ PRODUCT_PACKAGES += \ com.android.hotwordenrollment.common.util \ android.hardware.gnss@2.1-service-qti \ android.hardware.health@2.1-samsung \ + android.hardware.keymaster@4.0-strongbox-service-qti \ android.hardware.neuralnetworks@1.3-service-qti-hta \ android.hardware.neuralnetworks@1.3-service-qti \ manifest_android.hardware.drm@1.3-service.clearkey \