Merge "Remove PixelQualifiedNetworksService for AOSP builds." into udc-qpr-dev-plus-aosp
This commit is contained in:
commit
a5761f63bf
6 changed files with 0 additions and 40 deletions
|
@ -5,13 +5,11 @@
|
||||||
IMAGES/vendor_dlkm.img \
|
IMAGES/vendor_dlkm.img \
|
||||||
RADIO/bootloader.img \
|
RADIO/bootloader.img \
|
||||||
RADIO/radio.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.imsservice.xml \
|
||||||
system_ext/etc/permissions/com.shannon.rcsservice.xml \
|
system_ext/etc/permissions/com.shannon.rcsservice.xml \
|
||||||
system_ext/lib64/libmediaadaptor.so \
|
system_ext/lib64/libmediaadaptor.so \
|
||||||
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
||||||
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
||||||
system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
|
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
|
@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter husky,$(TARGET_DEVICE)),)
|
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)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||||
LOCAL_MODULE := ShannonIms
|
LOCAL_MODULE := ShannonIms
|
||||||
|
|
|
@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
|
|
||||||
# AOSP packages required by the blobs
|
# AOSP packages required by the blobs
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
PixelQualifiedNetworksService \
|
|
||||||
ShannonIms \
|
ShannonIms \
|
||||||
ShannonRcs \
|
ShannonRcs \
|
||||||
|
|
||||||
|
@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
|
||||||
|
|
||||||
# blob(s) necessary for husky hardware
|
# blob(s) necessary for husky hardware
|
||||||
PRODUCT_COPY_FILES := \
|
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.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 \
|
vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,11 @@
|
||||||
IMAGES/vendor_dlkm.img \
|
IMAGES/vendor_dlkm.img \
|
||||||
RADIO/bootloader.img \
|
RADIO/bootloader.img \
|
||||||
RADIO/radio.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.imsservice.xml \
|
||||||
system_ext/etc/permissions/com.shannon.rcsservice.xml \
|
system_ext/etc/permissions/com.shannon.rcsservice.xml \
|
||||||
system_ext/lib64/libmediaadaptor.so \
|
system_ext/lib64/libmediaadaptor.so \
|
||||||
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
||||||
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
||||||
system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
|
|
||||||
"
|
"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
|
@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter shiba,$(TARGET_DEVICE)),)
|
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)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||||
LOCAL_MODULE := ShannonIms
|
LOCAL_MODULE := ShannonIms
|
||||||
|
|
|
@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
|
|
||||||
# AOSP packages required by the blobs
|
# AOSP packages required by the blobs
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
PixelQualifiedNetworksService \
|
|
||||||
ShannonIms \
|
ShannonIms \
|
||||||
ShannonRcs \
|
ShannonRcs \
|
||||||
|
|
||||||
|
@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
|
||||||
|
|
||||||
# blob(s) necessary for shiba hardware
|
# blob(s) necessary for shiba hardware
|
||||||
PRODUCT_COPY_FILES := \
|
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.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 \
|
vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue