commit 3c012e9384078b27201d767769a9351c0f2deb5b
author Bill Yi <byi@google.com> Fri Mar 10 22:33:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 10 22:33:36 2023 +0000
tree 820e4c2ed9ceb2e00d036ad5af172b94bc9ea804
parent a410fede4164569e883f7d9743baa721906e7234
parent 790fac8db2a7b9f204580ec262c776aeecbf9c96

Add UwbVendorService blobs to Raven am: 790fac8db2

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2481578

Change-Id: Iedcff3789d201fc5e8b0d0736db303be87232bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

self-extractors_raven/extract-lists.txt

diff --git a/self-extractors_raven/extract-lists.txt b/self-extractors_raven/extract-lists.txt
index 0226644..ea7a5a9 100644
--- a/self-extractors_raven/extract-lists.txt
+++ b/self-extractors_raven/extract-lists.txt
@@ -8,12 +8,14 @@
             system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml \
             system_ext/etc/permissions/com.shannon.rcsservice.xml \
             system_ext/etc/permissions/oemrilhook.xml \
+            system_ext/etc/permissions/privapp-permissions-qorvo.xml \
             system_ext/framework/oemrilhook.jar \
             system_ext/lib64/libmediaadaptor.so \
             system_ext/lib/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
             system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
+            system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
             "
     ;;
 

self-extractors_raven/google_devices/staging/Android.mk

diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk
index 54f01eb..f3ad011 100644
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk
@@ -78,4 +78,20 @@
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := UwbVendorService
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := qorvo
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
+include $(BUILD_PREBUILT)
+
 endif

self-extractors_raven/google_devices/staging/device-partial.mk

diff --git a/self-extractors_raven/google_devices/staging/device-partial.mk b/self-extractors_raven/google_devices/staging/device-partial.mk
index 33cd4db..9f6324f 100644
--- a/self-extractors_raven/google_devices/staging/device-partial.mk
+++ b/self-extractors_raven/google_devices/staging/device-partial.mk
@@ -20,6 +20,7 @@
     ShannonQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \
+    UwbVendorService \
 
 PRODUCT_PACKAGES += \
     libmediaadaptor \
@@ -30,5 +31,6 @@
     vendor/google_devices/raven/proprietary/com.shannon.qualifiednetworksservice.xml:system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml:samsung \
     vendor/google_devices/raven/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
     vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \
+    vendor/google_devices/raven/proprietary/privapp-permissions-qorvo.xml:system_ext/etc/permissions/privapp-permissions-qorvo.xml:qorvo \
     vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \