From f4c78e58df6ab2e62bcc22df07e7e23654d74d5e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 14 Jun 2021 15:34:37 -0700 Subject: [PATCH] Remove two APKs from vendor blobs list Change app to priv-app for ShannonRcs Add owner BUG: 182332166 TEST: generate blobs Change-Id: I92dd30d3eea0d173418a8d06872cb4ac25b9d668 --- self-extractors_oriole/extract-lists.txt | 4 +-- .../google_devices/staging/Android.mk | 32 +------------------ .../google_devices/staging/device-partial.mk | 8 ++--- self-extractors_raven/extract-lists.txt | 4 +-- .../google_devices/staging/Android.mk | 32 +------------------ .../google_devices/staging/device-partial.mk | 8 ++--- 6 files changed, 10 insertions(+), 78 deletions(-) diff --git a/self-extractors_oriole/extract-lists.txt b/self-extractors_oriole/extract-lists.txt index 20a9d27..8bf7d90 100644 --- a/self-extractors_oriole/extract-lists.txt +++ b/self-extractors_oriole/extract-lists.txt @@ -9,9 +9,7 @@ system_ext/framework/oemrilhook.jar \ system_ext/lib64/libmediaadaptor.so \ system_ext/lib/libmediaadaptor.so \ - system_ext/app/ShannonDataService/ShannonDataService.apk \ - system_ext/app/ShannonNetworkService/ShannonNetworkService.apk \ - system_ext/app/ShannonRcs/ShannonRcs.apk \ + system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \ " diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk index 8beb558..11ff079 100644 --- a/self-extractors_oriole/google_devices/staging/Android.mk +++ b/self-extractors_oriole/google_devices/staging/Android.mk @@ -22,37 +22,6 @@ ifneq ($(filter oriole,$(TARGET_DEVICE)),) endif 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) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonQualifiedNetworksService @@ -75,6 +44,7 @@ LOCAL_MODULE := ShannonRcs 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 diff --git a/self-extractors_oriole/google_devices/staging/device-partial.mk b/self-extractors_oriole/google_devices/staging/device-partial.mk index d921ba6..93f2359 100644 --- a/self-extractors_oriole/google_devices/staging/device-partial.mk +++ b/self-extractors_oriole/google_devices/staging/device-partial.mk @@ -17,8 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - ShannonDataService \ - ShannonNetworkService \ ShannonQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -28,7 +26,7 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for oriole hardware 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/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml \ - vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar \ + 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:samsung \ + vendor/google_devices/oriole/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \ diff --git a/self-extractors_raven/extract-lists.txt b/self-extractors_raven/extract-lists.txt index 20a9d27..8bf7d90 100644 --- a/self-extractors_raven/extract-lists.txt +++ b/self-extractors_raven/extract-lists.txt @@ -9,9 +9,7 @@ system_ext/framework/oemrilhook.jar \ system_ext/lib64/libmediaadaptor.so \ system_ext/lib/libmediaadaptor.so \ - system_ext/app/ShannonDataService/ShannonDataService.apk \ - system_ext/app/ShannonNetworkService/ShannonNetworkService.apk \ - system_ext/app/ShannonRcs/ShannonRcs.apk \ + system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk \ " diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk index 6c17b9d..e4984fd 100644 --- a/self-extractors_raven/google_devices/staging/Android.mk +++ b/self-extractors_raven/google_devices/staging/Android.mk @@ -22,37 +22,6 @@ ifneq ($(filter raven,$(TARGET_DEVICE)),) endif 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) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE := ShannonQualifiedNetworksService @@ -91,6 +60,7 @@ LOCAL_MODULE := ShannonRcs 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 diff --git a/self-extractors_raven/google_devices/staging/device-partial.mk b/self-extractors_raven/google_devices/staging/device-partial.mk index a5267a7..e54dcad 100644 --- a/self-extractors_raven/google_devices/staging/device-partial.mk +++ b/self-extractors_raven/google_devices/staging/device-partial.mk @@ -17,8 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - ShannonDataService \ - ShannonNetworkService \ ShannonQualifiedNetworksService \ ShannonIms \ ShannonRcs \ @@ -28,7 +26,7 @@ PRODUCT_PACKAGES += \ # blob(s) necessary for raven hardware 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/oemrilhook.xml:system_ext/etc/permissions/oemrilhook.xml \ - vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar \ + 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:samsung \ + vendor/google_devices/raven/proprietary/oemrilhook.jar:system_ext/framework/oemrilhook.jar:samsung \