summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2019-06-27 18:12:01 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-27 18:12:01 -0700
commitb7f916b983475e52e6f6d445347b07cb21772145 (patch)
treeb9d96d884509db4c97bf685d200b33c187e1a633
parent4602588c88df38a9faab31f2072cf617ebc32b23 (diff)
parent1e05627ecc86fd397cf6cc2fc12b41dd30b5ab17 (diff)
downloadhikey-b7f916b983475e52e6f6d445347b07cb21772145.tar.gz
Merge changes from topic "gatekeeper_maintenance"
am: 1e05627ecc Change-Id: I0ab186875fde3148ad18164226893c3494cb669b
-rw-r--r--device-common.mk4
-rw-r--r--sepolicy/file_contexts1
2 files changed, 5 insertions, 0 deletions
diff --git a/device-common.mk b/device-common.mk
index 2d245a2b..85e9f333 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -115,6 +115,10 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.gnss@1.0-impl
+# Software Gatekeeper HAL
+PRODUCT_PACKAGES += \
+ android.hardware.gatekeeper@1.0-service.software
+
# Keymaster HAL
PRODUCT_PACKAGES += \
android.hardware.keymaster@3.0-impl \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 52a29e50..5c010f0c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -34,6 +34,7 @@
/dev/block/platform/soc/f723d000\.dwmmc0/by-name/userdata u:object_r:userdata_block_device:s0
+/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0
/vendor/bin/hw/android\.hardware\.power@1\.1-service\.hikey-common u:object_r:hal_power_default_exec:s0
/vendor/lib(64)?/libRSDriverArm\.so u:object_r:same_process_hal_file:s0