From 56978d99612712273419c599a2897df0770a4509 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 18 Jun 2021 09:30:50 +0800 Subject: [PATCH] organize confirmationui settings Bug: 190331547 Bug: 190331370 Test: build ROM and make sure file and sepolicy is still there Change-Id: Ifc2bcf1616d3ee2df3943f0f1b3523ce485b689c --- confirmationui/confirmationui.mk | 9 +++++++++ device.mk | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 confirmationui/confirmationui.mk diff --git a/confirmationui/confirmationui.mk b/confirmationui/confirmationui.mk new file mode 100644 index 00000000..85f77c94 --- /dev/null +++ b/confirmationui/confirmationui.mk @@ -0,0 +1,9 @@ +# Trusty ConfirmationUI HAL +PRODUCT_PACKAGES += \ + android.hardware.confirmationui@1.0-service.trusty.vendor + +# Trusty Secure DPU Daemon +PRODUCT_PACKAGES += \ + securedpud.slider + +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/confirmationui/ diff --git a/device.mk b/device.mk index e6455324..0f14978b 100644 --- a/device.mk +++ b/device.mk @@ -777,13 +777,7 @@ $(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty unit test tool PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl -# Trusty ConfirmationUI HAL -PRODUCT_PACKAGES += \ - android.hardware.confirmationui@1.0-service.trusty.vendor - -# Trusty Secure DPU Daemon -PRODUCT_PACKAGES += \ - securedpud.slider +include device/google/gs101/confirmationui/confirmationui.mk include device/google/gs101/trusty_metricsd/trusty_metricsd.mk