Snap for 11275524 from 554b9ce8f3
to 24Q2-release
Change-Id: I8bad064df35e46efaccfef3a4133636c20464030
This commit is contained in:
commit
844172fb89
4 changed files with 9 additions and 18 deletions
|
@ -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)
|
||||
|
|
|
@ -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 \
|
||||
"
|
||||
;;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
|
||||
# AOSP packages required by the blobs
|
||||
PRODUCT_PACKAGES := \
|
||||
PixelQualifiedNetworksService \
|
||||
ShannonIms \
|
||||
ShannonRcs \
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue