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: Id778655f2a5021aba938a1befd1d6dd151b88283
diff --git a/self-extractors_sailfish/extract-lists.txt b/self-extractors_sailfish/extract-lists.txt
index b3fd437..fc164dc 100644
--- a/self-extractors_sailfish/extract-lists.txt
+++ b/self-extractors_sailfish/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/lib/libclcore_neon.bc \
system/lib64/libiperf.so \
diff --git a/self-extractors_sailfish/qcom/staging/device-partial.mk b/self-extractors_sailfish/qcom/staging/device-partial.mk
index 8a54876..98b6a72 100644
--- a/self-extractors_sailfish/qcom/staging/device-partial.mk
+++ b/self-extractors_sailfish/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 Sailfish hardware
PRODUCT_COPY_FILES := \
vendor/qcom/sailfish/proprietary/pktlogconf:system/bin/pktlogconf:qcom \
vendor/qcom/sailfish/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
vendor/qcom/sailfish/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \
vendor/qcom/sailfish/proprietary/VZW_profiles.xml:system/etc/cne/Nexus/VZW/VZW_profiles.xml:qcom \
- vendor/qcom/sailfish/proprietary/com.android.ims.rcsmanager.xml:system/etc/permissions/com.android.ims.rcsmanager.xml:qcom \
- vendor/qcom/sailfish/proprietary/com.android.ims.rcsmanager.jar:system/framework/com.android.ims.rcsmanager.jar:qcom \
vendor/qcom/sailfish/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \
vendor/qcom/sailfish/proprietary/libclcore_neon.bc:system/lib/libclcore_neon.bc:qcom \
vendor/qcom/sailfish/proprietary/lib64/libiperf.so:system/lib64/libiperf.so:qcom \
