Remove two APKs from vendor blobs list
Change app to priv-app for ShannonRcs Add owner BUG: 182332166 TEST: generate blobs Change-Id: I92dd30d3eea0d173418a8d06872cb4ac25b9d668
This commit is contained in:
parent
e537b06099
commit
f4c78e58df
6 changed files with 10 additions and 78 deletions
|
@ -9,9 +9,7 @@
|
||||||
system_ext/framework/oemrilhook.jar \
|
system_ext/framework/oemrilhook.jar \
|
||||||
system_ext/lib64/libmediaadaptor.so \
|
system_ext/lib64/libmediaadaptor.so \
|
||||||
system_ext/lib/libmediaadaptor.so \
|
system_ext/lib/libmediaadaptor.so \
|
||||||
system_ext/app/ShannonDataService/ShannonDataService.apk \
|
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
||||||
system_ext/app/ShannonNetworkService/ShannonNetworkService.apk \
|
|
||||||
system_ext/app/ShannonRcs/ShannonRcs.apk \
|
|
||||||
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
||||||
system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
|
system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
|
||||||
"
|
"
|
||||||
|
|
|
@ -22,37 +22,6 @@ ifneq ($(filter oriole,$(TARGET_DEVICE)),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter oriole,$(TARGET_DEVICE)),)
|
ifneq ($(filter oriole,$(TARGET_DEVICE)),)
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
|
||||||
LOCAL_MODULE := ShannonDataService
|
|
||||||
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 := ShannonNetworkService
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
|
||||||
LOCAL_BUILT_MODULE_STEM := package.apk
|
|
||||||
LOCAL_SYSTEM_EXT_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)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||||
LOCAL_MODULE := ShannonQualifiedNetworksService
|
LOCAL_MODULE := ShannonQualifiedNetworksService
|
||||||
|
@ -75,6 +44,7 @@ LOCAL_MODULE := ShannonRcs
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_BUILT_MODULE_STEM := package.apk
|
LOCAL_BUILT_MODULE_STEM := package.apk
|
||||||
LOCAL_SYSTEM_EXT_MODULE := true
|
LOCAL_SYSTEM_EXT_MODULE := true
|
||||||
|
LOCAL_PRIVILEGED_MODULE := true
|
||||||
LOCAL_MODULE_OWNER := samsung
|
LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
|
|
|
@ -17,8 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
|
|
||||||
# AOSP packages required by the blobs
|
# AOSP packages required by the blobs
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
ShannonDataService \
|
|
||||||
ShannonNetworkService \
|
|
||||||
ShannonQualifiedNetworksService \
|
ShannonQualifiedNetworksService \
|
||||||
ShannonIms \
|
ShannonIms \
|
||||||
ShannonRcs \
|
ShannonRcs \
|
||||||
|
@ -28,7 +26,7 @@ PRODUCT_PACKAGES += \
|
||||||
|
|
||||||
# blob(s) necessary for oriole hardware
|
# blob(s) necessary for oriole hardware
|
||||||
PRODUCT_COPY_FILES := \
|
PRODUCT_COPY_FILES := \
|
||||||
vendor/google_devices/oriole/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml \
|
vendor/google_devices/oriole/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
|
||||||
vendor/google_devices/oriole/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml \
|
vendor/google_devices/oriole/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \
|
||||||
vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar \
|
vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,7 @@
|
||||||
system_ext/framework/oemrilhook.jar \
|
system_ext/framework/oemrilhook.jar \
|
||||||
system_ext/lib64/libmediaadaptor.so \
|
system_ext/lib64/libmediaadaptor.so \
|
||||||
system_ext/lib/libmediaadaptor.so \
|
system_ext/lib/libmediaadaptor.so \
|
||||||
system_ext/app/ShannonDataService/ShannonDataService.apk \
|
system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
|
||||||
system_ext/app/ShannonNetworkService/ShannonNetworkService.apk \
|
|
||||||
system_ext/app/ShannonRcs/ShannonRcs.apk \
|
|
||||||
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
system_ext/priv-app/ShannonIms/ShannonIms.apk \
|
||||||
system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
|
system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \
|
||||||
"
|
"
|
||||||
|
|
|
@ -22,37 +22,6 @@ ifneq ($(filter raven,$(TARGET_DEVICE)),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter raven,$(TARGET_DEVICE)),)
|
ifneq ($(filter raven,$(TARGET_DEVICE)),)
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
|
||||||
LOCAL_MODULE := ShannonDataService
|
|
||||||
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 := ShannonNetworkService
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
|
||||||
LOCAL_BUILT_MODULE_STEM := package.apk
|
|
||||||
LOCAL_SYSTEM_EXT_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)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
|
||||||
LOCAL_MODULE := ShannonQualifiedNetworksService
|
LOCAL_MODULE := ShannonQualifiedNetworksService
|
||||||
|
@ -91,6 +60,7 @@ LOCAL_MODULE := ShannonRcs
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_BUILT_MODULE_STEM := package.apk
|
LOCAL_BUILT_MODULE_STEM := package.apk
|
||||||
LOCAL_SYSTEM_EXT_MODULE := true
|
LOCAL_SYSTEM_EXT_MODULE := true
|
||||||
|
LOCAL_PRIVILEGED_MODULE := true
|
||||||
LOCAL_MODULE_OWNER := samsung
|
LOCAL_MODULE_OWNER := samsung
|
||||||
LOCAL_MODULE_CLASS := APPS
|
LOCAL_MODULE_CLASS := APPS
|
||||||
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
|
||||||
|
|
|
@ -17,8 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
|
|
||||||
# AOSP packages required by the blobs
|
# AOSP packages required by the blobs
|
||||||
PRODUCT_PACKAGES := \
|
PRODUCT_PACKAGES := \
|
||||||
ShannonDataService \
|
|
||||||
ShannonNetworkService \
|
|
||||||
ShannonQualifiedNetworksService \
|
ShannonQualifiedNetworksService \
|
||||||
ShannonIms \
|
ShannonIms \
|
||||||
ShannonRcs \
|
ShannonRcs \
|
||||||
|
@ -28,7 +26,7 @@ PRODUCT_PACKAGES += \
|
||||||
|
|
||||||
# blob(s) necessary for raven hardware
|
# blob(s) necessary for raven hardware
|
||||||
PRODUCT_COPY_FILES := \
|
PRODUCT_COPY_FILES := \
|
||||||
vendor/google_devices/raven/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml \
|
vendor/google_devices/raven/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
|
||||||
vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml \
|
vendor/google_devices/raven/proprietary/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml:samsung \
|
||||||
vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar \
|
vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue