commit 8144b338f04c473fb9966c1383aa04c658eb19a0
author Victor Liu <victorliu@google.com> Wed Oct 20 15:49:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 20 15:49:49 2021 +0000
tree 408d5887e31e57435af7acc0a981cbd666575630
parent a7f4ef05b52f611e89b2966a9c744866118f3b94
parent 193c85c4efd2dfbb98ca2d27d9ed44a0b2ff50c0

move uwb feature to system_ext am: 52317f994b

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16088272

Change-Id: Ibdabb697d1e81d5380691e5422ee6e2ad49e7242

uwb/uwb.mk

diff --git a/uwb/uwb.mk b/uwb/uwb.mk
index 7078002..72663b4 100644
--- a/uwb/uwb.mk
+++ b/uwb/uwb.mk
@@ -18,29 +18,24 @@
 
 LOCAL_UWB_CAL_DIR=device/google/gs101/uwb/calibration
 
-ifneq (,$(filter raven, $(TARGET_PRODUCT)))
 PRODUCT_COPY_FILES += \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf.raven:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf.raven:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf.raven:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-jp.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-jp.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ar.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ar.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-am.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-am.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-az.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-az.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-by.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-by.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-id.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-id.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kz.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-kz.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kg.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-kg.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-np.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-np.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-pk.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-pk.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-py.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-py.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ru.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ru.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-sb.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-sb.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tj.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-tj.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tm.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-tm.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ua.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ua.conf \
-    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-uz.conf.r4:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-uz.conf
-endif
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-jp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-jp.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ar.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ar.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-am.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-am.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-az.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-az.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-by.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-by.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-id.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-id.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kz.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-kz.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-kg.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-kg.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-np.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-np.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-pk.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-pk.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-py.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-py.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ru.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ru.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-sb.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-sb.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tj.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-tj.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-tm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-tm.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-ua.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-ua.conf \
+    $(LOCAL_UWB_CAL_DIR)/UWB-calibration-uz.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-uz.conf
 
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml
+    frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/android.hardware.uwb.xml