From 97ba43cc4516db770fcf26e6e8e7c8fcc79abd23 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
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: Idbf5efc7da759ef264cbe5829519a94171a0401f
---
 self-extractors/extract-lists.txt                |  1 -
 .../google_devices/staging/Android.mk.template   | 16 ----------------
 .../google_devices/staging/device-partial.mk     |  1 -
 3 files changed, 18 deletions(-)

diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 9fc0800..c783a92 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -11,7 +11,6 @@
             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 \
             system_ext/priv-app/UwbVendorService/UwbVendorService.apk \
             "
     ;;
diff --git a/self-extractors/google_devices/staging/Android.mk.template b/self-extractors/google_devices/staging/Android.mk.template
index 01369bf..f1eb6b1 100644
--- a/self-extractors/google_devices/staging/Android.mk.template
+++ b/self-extractors/google_devices/staging/Android.mk.template
@@ -22,22 +22,6 @@ ifneq ($(filter felix,$(TARGET_DEVICE)),)
 endif
 
 ifneq ($(filter felix,$(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 := samsung
-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/google_devices/staging/device-partial.mk b/self-extractors/google_devices/staging/device-partial.mk
index 9c4717f..42c43e7 100644
--- a/self-extractors/google_devices/staging/device-partial.mk
+++ b/self-extractors/google_devices/staging/device-partial.mk
@@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \
     UwbVendorService \