From 623233eac6150b37b230aedd2dd3a10d13484fb6 Mon Sep 17 00:00:00 2001 From: Xin Li Date: Thu, 4 Jan 2024 08:59:25 -0800 Subject: [PATCH] Remove PixelQualifiedNetworksService for AOSP builds. Bug: 309712809 Test: https://android-build.corp.google.com/builds/abtd/run/L26400030001089366 Change-Id: I23d7edacdce64bfc1ba99139b4dffbce149a6853 --- self-extractors_husky/extract-lists.txt | 2 -- .../google_devices/staging/Android.mk | 16 ---------------- .../google_devices/staging/device-partial.mk | 2 -- self-extractors_shiba/extract-lists.txt | 2 -- .../google_devices/staging/Android.mk | 16 ---------------- .../google_devices/staging/device-partial.mk | 2 -- 6 files changed, 40 deletions(-) diff --git a/self-extractors_husky/extract-lists.txt b/self-extractors_husky/extract-lists.txt index e8333da..9f3c26f 100644 --- a/self-extractors_husky/extract-lists.txt +++ b/self-extractors_husky/extract-lists.txt @@ -5,13 +5,11 @@ IMAGES/vendor_dlkm.img \ RADIO/bootloader.img \ RADIO/radio.img \ - system_ext/etc/permissions/com.android.qns.xml \ system_ext/etc/permissions/com.shannon.imsservice.xml \ system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_husky/google_devices/staging/Android.mk b/self-extractors_husky/google_devices/staging/Android.mk index a3a6f13..7aa8601 100644 --- a/self-extractors_husky/google_devices/staging/Android.mk +++ b/self-extractors_husky/google_devices/staging/Android.mk @@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),) endif ifneq ($(filter husky,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := PixelQualifiedNetworksService -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := google -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) - include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_husky/google_devices/staging/device-partial.mk b/self-extractors_husky/google_devices/staging/device-partial.mk index 9251f56..a5fd796 100644 --- a/self-extractors_husky/google_devices/staging/device-partial.mk +++ b/self-extractors_husky/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for husky hardware PRODUCT_COPY_FILES := \ - vendor/google_devices/husky/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \ vendor/google_devices/husky/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \ diff --git a/self-extractors_shiba/extract-lists.txt b/self-extractors_shiba/extract-lists.txt index e8333da..9f3c26f 100644 --- a/self-extractors_shiba/extract-lists.txt +++ b/self-extractors_shiba/extract-lists.txt @@ -5,13 +5,11 @@ IMAGES/vendor_dlkm.img \ RADIO/bootloader.img \ RADIO/radio.img \ - system_ext/etc/permissions/com.android.qns.xml \ system_ext/etc/permissions/com.shannon.imsservice.xml \ system_ext/etc/permissions/com.shannon.rcsservice.xml \ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_shiba/google_devices/staging/Android.mk b/self-extractors_shiba/google_devices/staging/Android.mk index 124f68a..60eca2a 100644 --- a/self-extractors_shiba/google_devices/staging/Android.mk +++ b/self-extractors_shiba/google_devices/staging/Android.mk @@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),) endif ifneq ($(filter shiba,$(TARGET_DEVICE)),) -include $(CLEAR_VARS) -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := PixelQualifiedNetworksService -LOCAL_MODULE_TAGS := optional -LOCAL_BUILT_MODULE_STEM := package.apk -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_PRIVILEGED_MODULE := true -LOCAL_MODULE_OWNER := google -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) - include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonIms diff --git a/self-extractors_shiba/google_devices/staging/device-partial.mk b/self-extractors_shiba/google_devices/staging/device-partial.mk index 99e217f..9c64f07 100644 --- a/self-extractors_shiba/google_devices/staging/device-partial.mk +++ b/self-extractors_shiba/google_devices/staging/device-partial.mk @@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for shiba hardware PRODUCT_COPY_FILES := \ - vendor/google_devices/shiba/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \ vendor/google_devices/shiba/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \ vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \