From 395ae043ba4f4101c717ea7194c5d86734e64718 Mon Sep 17 00:00:00 2001 From: Yu-Chi Cheng Date: Wed, 28 Apr 2021 10:52:14 -0700 Subject: [PATCH] Added EdgeTPU vendor service into P21. The original edgetpu_service is now split into two, where the original one stays under /system_ext/ and the new one, edgetpu_vendor_service, now locates under /vendor/. This change updates files including device.mk accordingly to ensure these services are setup properly on P21. Bug: 185432427 Test: Oriole + GCA Change-Id: I5b0eff64f2f044a56bc14cf5e1d92ec3463560a9 --- conf/init.gs101.rc | 4 +++- conf/init.system_ext.rc | 4 ---- device.mk | 14 +++++--------- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 conf/init.system_ext.rc diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index aaa90fc1..f3991299 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -275,9 +275,11 @@ on post-fs-data # Audio dump and debug mkdir /data/vendor/audio 0770 audio audio - # Create the directories for Darwinn HAL. +# Create the directories for Darwinn HAL. mkdir /data/vendor/hal_neuralnetworks_darwinn 0770 system system mkdir /data/vendor/hal_neuralnetworks_darwinn/checksum_cache 0770 system system + mkdir /data/vendor/edgetpu 0770 system system + mkdir /data/vendor/edgetpu/cache 0770 system system on zygote-start # For PixelLogger configuration file. diff --git a/conf/init.system_ext.rc b/conf/init.system_ext.rc deleted file mode 100644 index 4fb47b32..00000000 --- a/conf/init.system_ext.rc +++ /dev/null @@ -1,4 +0,0 @@ -on post-fs-data - # EdgeTPU data directory - mkdir /data/edgetpu 0770 system system encryption=Require - mkdir /data/edgetpu/cache 0770 system system diff --git a/device.mk b/device.mk index c3b4efa4..d73a31ab 100644 --- a/device.mk +++ b/device.mk @@ -193,10 +193,6 @@ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc endif -# Init files for /system_ext -PRODUCT_COPY_FILES += \ - device/google/gs101/conf/init.system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.system_ext.rc - # If AoC Daemon is not present on this build, load firmware at boot via rc ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),) PRODUCT_COPY_FILES += \ @@ -1090,18 +1086,18 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.edgetpu.logging@service-edgetpu-logging -# TPU HAL service +# TPU application service PRODUCT_PACKAGES += \ vendor.google.edgetpu@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 HAL client library vendor variant -PRODUCT_PACKAGES += \ - libedgetpu_client.google.vendor - # Connectivity Thermal Power Manager PRODUCT_PACKAGES += \ ConnectivityThermalPowerManager