From cdc350b5e65a29e4509aef321fb46cdcfa5b0256 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 9 Jun 2021 14:07:27 +0800 Subject: [PATCH] reorganize trusty_metricsd settings Bug: 190331503 Test: build ROM and see the file and sepolicy settings are still there Change-Id: I212df916799b8acf831158153209bd2a1f7dfc5f --- device.mk | 7 +------ trusty_metricsd/trusty_metricsd.mk | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 trusty_metricsd/trusty_metricsd.mk diff --git a/device.mk b/device.mk index b4ff16b6..459e301a 100644 --- a/device.mk +++ b/device.mk @@ -783,12 +783,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ securedpud.slider -# Trusty Metrics Daemon -PRODUCT_SOONG_NAMESPACES += \ - vendor/google/trusty/common - -PRODUCT_PACKAGES += \ - trusty_metricsd +include device/google/gs101/trusty_metricsd/trusty_metricsd.mk PRODUCT_PACKAGES += \ android.hardware.graphics.composer@2.4-impl \ diff --git a/trusty_metricsd/trusty_metricsd.mk b/trusty_metricsd/trusty_metricsd.mk new file mode 100644 index 00000000..487875be --- /dev/null +++ b/trusty_metricsd/trusty_metricsd.mk @@ -0,0 +1,6 @@ +# Trusty Metrics Daemon +PRODUCT_SOONG_NAMESPACES += \ + vendor/google/trusty/common + +PRODUCT_PACKAGES += trusty_metricsd +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/trusty_metricsd