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: Flashed a device
Change-Id: I441dd765ed50598198842ccf07d80bf484fc43ef
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 6afabea..662e90c 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -9,8 +9,6 @@
system/etc/cne/Nexus/ATT/ATT_profiles.xml \
system/etc/cne/Nexus/ROW/ROW_profiles.xml \
system/etc/cne/Nexus/VZW/VZW_profiles.xml \
- system/etc/permissions/com.android.ims.rcsmanager.xml \
- system/framework/com.android.ims.rcsmanager.jar \
system/framework/qcrilhook.jar \
system/lib64/libaptX_encoder.so \
system/lib64/libaptXHD_encoder.so \
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index e8ea4c1..c409e86 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -12,14 +12,17 @@
# 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 Marlin hardware
PRODUCT_COPY_FILES := \
vendor/qcom/marlin/proprietary/pktlogconf:system/bin/pktlogconf:qcom \
vendor/qcom/marlin/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
vendor/qcom/marlin/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \
vendor/qcom/marlin/proprietary/VZW_profiles.xml:system/etc/cne/Nexus/VZW/VZW_profiles.xml:qcom \
- vendor/qcom/marlin/proprietary/com.android.ims.rcsmanager.xml:system/etc/permissions/com.android.ims.rcsmanager.xml:qcom \
- vendor/qcom/marlin/proprietary/com.android.ims.rcsmanager.jar:system/framework/com.android.ims.rcsmanager.jar:qcom \
vendor/qcom/marlin/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \
vendor/qcom/marlin/proprietary/lib64/libaptX_encoder.so:system/lib64/libaptX_encoder.so:qcom \
vendor/qcom/marlin/proprietary/lib64/libaptXHD_encoder.so:system/lib64/libaptXHD_encoder.so:qcom \
