Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Browse source 
Bug: 337098550
Merged-In: I67dc687f1751a17b6ff1431697a380b82d53c799
Change-Id: I9854060d05a23ac0a21b51d62ab5831d17e765a4
This commit is contained in:
Xin Li 2024-05-17 11:03:46 -07:00
commit cd35c7dfcf
58 changed files with 511 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

0
self-extractors_husky/Android.mk
View file

2
self-extractors_husky/extract-lists.txt
View file

@ -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 \
"
;;

16
self-extractors_husky/google_devices/staging/Android.mk → self-extractors_husky/google_devices/staging/Android.mk.template
View file

@ -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

2
self-extractors_husky/google_devices/staging/device-partial.mk
View file

@ -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 \