commit b7f916b983475e52e6f6d445347b07cb21772145
author Janis Danisevskis <jdanis@google.com> Thu Jun 27 18:12:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 27 18:12:01 2019 -0700
tree b9d96d884509db4c97bf685d200b33c187e1a633
parent 4602588c88df38a9faab31f2072cf617ebc32b23
parent 1e05627ecc86fd397cf6cc2fc12b41dd30b5ab17

Merge changes from topic "gatekeeper_maintenance"
am: 1e05627ecc

Change-Id: I0ab186875fde3148ad18164226893c3494cb669b

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 2d245a2..85e9f33 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -115,6 +115,10 @@
 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 \

sepolicy/file_contexts

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 52a29e5..5c010f0 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