From 73f714bcc9fd8348f7205d6665bbf53cc6f7a860 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 8 Nov 2022 13:23:39 +0800 Subject: [PATCH] move edgeTPU settings to gs-common Bug: 258114806 Test: build pass with everything still in the ROM Change-Id: Iad9ade8632a1f36abd719ceb728b1692798d67da --- device.mk | 9 +++++++-- edgetpu/OWNERS | 6 ------ edgetpu/edgetpu.mk | 28 ---------------------------- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 edgetpu/OWNERS delete mode 100644 edgetpu/edgetpu.mk diff --git a/device.mk b/device.mk index 977aa25f..43a292bc 100644 --- a/device.mk +++ b/device.mk @@ -1118,8 +1118,13 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true include hardware/google/pixel/thermal/device.mk $(call soong_config_set,thermal_hal_feature,pid,apply_2_0) -## TPU packages -include device/google/gs201/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,janeiro) +# TPU firmware +PRODUCT_PACKAGES += edgetpu-janeiro.fw + # Connectivity Thermal Power Manager PRODUCT_PACKAGES += \ diff --git a/edgetpu/OWNERS b/edgetpu/OWNERS deleted file mode 100644 index 9eb92a96..00000000 --- a/edgetpu/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# Devs who work on EdgeTPU on Android. -hsuy@google.com -yuchicheng@google.com -iayara@google.com -qinyiyan@google.com -macwang@google.com \ No newline at end of file diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk deleted file mode 100644 index c97b5abc..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,janeiro) - -# TPU logging service -PRODUCT_PACKAGES += \ - android.hardware.edgetpu.logging@service-edgetpu-logging -# TPU firmware -PRODUCT_PACKAGES += \ - edgetpu-janeiro.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/gs201-sepolicy/edgetpu/