From a169c37d9dc4256e9d0b8f2287d8b48c33f5a278 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 9 Jun 2021 10:40:54 +0800 Subject: [PATCH] organize EdgeTPU modules and sepolicy Bug: 190331327 Bug: 190331548 Bug: 189895600 Bug: 190331108 Bug: 182524105 Bug: 183935302 Test: build ROM and check if the modules and sepolicy are still there Change-Id: Id28ac2094e14051defe0401055d862c6353194f7 --- device.mk | 28 +--------------------------- edgetpu/edgetpu.mk | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 edgetpu/edgetpu.mk diff --git a/device.mk b/device.mk index d7834659..b4ff16b6 100644 --- a/device.mk +++ b/device.mk @@ -1073,33 +1073,7 @@ PRODUCT_PROPERTY_OVERRIDES += vendor.pktrouter=1 include hardware/google/pixel/thermal/device.mk PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true -# TPU firmware -PRODUCT_PACKAGES += \ - edgetpu-abrolhos.fw - -# TPU NN AIDL HAL -PRODUCT_PACKAGES += \ - android.hardware.neuralnetworks@service-darwinn-aidl - -# TPU logging service -PRODUCT_PACKAGES += \ - android.hardware.edgetpu.logging@service-edgetpu-logging - -# TPU application service -PRODUCT_PACKAGES += \ - vendor.google.edgetpu_app_service@1.0-service - -# TPU vendor service -PRODUCT_PACKAGES += \ - vendor.google.edgetpu_vendor_service@1.0-service - -# TPU HAL client library -PRODUCT_PACKAGES += \ - libedgetpu_client.google - -# TPU metrics logger library -PRODUCT_PACKAGES += \ - libmetrics_logger +include device/google/gs101/edgetpu/edgetpu.mk # Connectivity Thermal Power Manager PRODUCT_PACKAGES += \ diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk new file mode 100644 index 00000000..c183cd2b --- /dev/null +++ b/edgetpu/edgetpu.mk @@ -0,0 +1,29 @@ +# TPU logging service +PRODUCT_PACKAGES += \ + android.hardware.edgetpu.logging@service-edgetpu-logging + +# TPU firmware +PRODUCT_PACKAGES += \ + edgetpu-abrolhos.fw + +# TPU NN AIDL HAL +PRODUCT_PACKAGES += \ + android.hardware.neuralnetworks@service-darwinn-aidl + +# TPU application service +PRODUCT_PACKAGES += \ + vendor.google.edgetpu_app_service@1.0-service + +# TPU vendor service +PRODUCT_PACKAGES += \ + vendor.google.edgetpu_vendor_service@1.0-service + +# TPU HAL client library +PRODUCT_PACKAGES += \ + libedgetpu_client.google + +# TPU metrics logger library +PRODUCT_PACKAGES += \ + libmetrics_logger + +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/