From 15f8fb304dd47f481b2b30c3a99934b9c1d1f09a Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 8 Nov 2022 13:41:38 +0800 Subject: [PATCH] move edgeTPU setting to gs-common Bug: 258114806 Test: build with the module still in place Change-Id: I1ba4c13a953c039704aaf0a19b1bd47019d184b4 --- device.mk | 8 ++++++-- edgetpu/OWNERS | 5 ----- edgetpu/edgetpu.mk | 28 ---------------------------- 3 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 edgetpu/OWNERS delete mode 100644 edgetpu/edgetpu.mk diff --git a/device.mk b/device.mk index bab42b14..e46e5509 100644 --- a/device.mk +++ b/device.mk @@ -1050,8 +1050,12 @@ include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/thermal/device.mk PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true -## TPU packages -include device/google/zuma/edgetpu/edgetpu.mk +# EdgeTPU +include device/google/gs-common/edgetpu/edgetpu.mk +# Config variables for TPU chip on device. +$(call soong_config_set,edgetpu_config,chip,rio) +# TPU firmware +PRODUCT_PACKAGES += edgetpu-rio.fw # Connectivity Thermal Power Manager PRODUCT_PACKAGES += \ diff --git a/edgetpu/OWNERS b/edgetpu/OWNERS deleted file mode 100644 index e5718485..00000000 --- a/edgetpu/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -# Devs who work on EdgeTPU on Android. -hsuy@google.com -yuchicheng@google.com -qinyiyan@google.com -macwang@google.com diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk deleted file mode 100644 index 42254435..00000000 --- a/edgetpu/edgetpu.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Edgetpu packages - -# Config variables for TPU chip on device. -$(call soong_config_set,edgetpu_config,chip,rio) - -# TPU logging service - PRODUCT_PACKAGES += \ - android.hardware.edgetpu.logging@service-edgetpu-logging -# TPU firmware - PRODUCT_PACKAGES += \ - edgetpu-rio.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/ -BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/edgetpu/