From 0279f91e52878d970d64f58803ca291e12a60e62 Mon Sep 17 00:00:00 2001
From: Aaron Ding <aaronding@google.com>
Date: Wed, 27 Dec 2023 00:51:42 +0800
Subject: [PATCH 1/2] lynx: control the kernel by release configuration

Bug: 317784824
Change-Id: Id106eacf318dc398b0a0fd2bbcda790ff61017c5
Signed-off-by: Aaron Ding <aaronding@google.com>
---
 device-lynx.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index 5fd0dc9..2f4762c 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -17,6 +17,15 @@
 TARGET_KERNEL_DIR ?= device/google/lynx-kernel
 TARGET_BOARD_KERNEL_HEADERS := device/google/lynx-kernel/kernel-headers
 
+ifdef RELEASE_GOOGLE_LYNX_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_LYNX_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_LYNX_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_LYNX_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_LYNX_KERNEL_DIR)/kernel-headers
+endif
+
 $(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)

From d51dcf7084e4f10e12a99b59c2de75c6c3c0d993 Mon Sep 17 00:00:00 2001
From: Xin Li <delphij@google.com>
Date: Thu, 4 Jan 2024 08:59:25 -0800
Subject: [PATCH 2/2] Remove PixelQualifiedNetworksService for AOSP builds.

Bug: 309712809
Test: https://android-build.corp.google.com/builds/abtd/run/L26400030001089366
Change-Id: I448be8c8e411d1af6e7190d6e0676d4c73a91610
---
 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 63655a4..9f3c26f 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -10,7 +10,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 \
             "
     ;;
 
diff --git a/self-extractors/google_devices/staging/Android.mk.template b/self-extractors/google_devices/staging/Android.mk.template
index a720400..a2fc0db 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 lynx,$(TARGET_DEVICE)),)
 endif
 
 ifneq ($(filter lynx,$(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/google_devices/staging/device-partial.mk b/self-extractors/google_devices/staging/device-partial.mk
index d4e5924..0f38117 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 \