From c0dccb9d027d85c684c30c4195f226de44d99887 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 30 Jan 2018 14:53:41 -0800 Subject: [PATCH] Don't package AOSP component com.android.ims.rcsmanager This module is part of AOSP, build it from source instead of using prebuilt blobs. Test: None Change-Id: Idcc0203a611e71337b9737a511befeb8308a8ad1 --- self-extractors/extract-lists.txt | 2 -- self-extractors/qcom/staging/device-partial.mk | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt index 09a452c..ef4d2f1 100644 --- a/self-extractors/extract-lists.txt +++ b/self-extractors/extract-lists.txt @@ -12,9 +12,7 @@ system/etc/firmware/dnd.sound_model \ system/etc/firmware/music_detector.descriptor \ system/etc/firmware/music_detector.sound_model \ - system/etc/permissions/com.android.ims.rcsmanager.xml \ system/framework/cneapiclient.jar \ - system/framework/com.android.ims.rcsmanager.jar \ system/framework/com.quicinc.cne.api-V1.0-java.jar \ system/framework/com.quicinc.cne.jar \ system/framework/embmslibrary.jar \ diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk index c0b657d..a58c461 100644 --- a/self-extractors/qcom/staging/device-partial.mk +++ b/self-extractors/qcom/staging/device-partial.mk @@ -12,6 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# AOSP packages required by the blobs +PRODUCT_PACKAGES := \ + com.android.ims.rcsmanager.xml \ + com.android.ims.rcsmanager + # blob(s) necessary for Taimen hardware PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \ @@ -21,9 +26,7 @@ PRODUCT_COPY_FILES := \ vendor/qcom/taimen/proprietary/dnd.sound_model:system/etc/firmware/dnd.sound_model:qcom \ vendor/qcom/taimen/proprietary/music_detector.descriptor:system/etc/firmware/music_detector.descriptor:qcom \ vendor/qcom/taimen/proprietary/music_detector.sound_model:system/etc/firmware/music_detector.sound_model:qcom \ - vendor/qcom/taimen/proprietary/com.android.ims.rcsmanager.xml:system/etc/permissions/com.android.ims.rcsmanager.xml:qcom \ vendor/qcom/taimen/proprietary/cneapiclient.jar:system/framework/cneapiclient.jar:qcom \ - vendor/qcom/taimen/proprietary/com.android.ims.rcsmanager.jar:system/framework/com.android.ims.rcsmanager.jar:qcom \ vendor/qcom/taimen/proprietary/com.quicinc.cne.api-V1.0-java.jar:system/framework/com.quicinc.cne.api-V1.0-java.jar:qcom \ vendor/qcom/taimen/proprietary/com.quicinc.cne.jar:system/framework/com.quicinc.cne.jar:qcom \ vendor/qcom/taimen/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \