Add ims.apk blob
BUG:138143812
Change-Id: I16e51ef289adfe587e15e30539a6c81cad3043b3
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index fb7abcd..b963792 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -5,6 +5,7 @@
;;
qcom)
TO_EXTRACT="\
+ system/app/ims/ims.apk \
system/app/QtiTelephonyService/QtiTelephonyService.apk \
system/etc/cne/andsfCne.xml \
system/etc/permissions/cneapiclient.xml \
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk
index b7bee38..7c88157 100644
--- a/self-extractors/qcom/staging/Android.mk
+++ b/self-extractors/qcom/staging/Android.mk
@@ -1,8 +1,18 @@
LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
ifneq ($(filter bonito, $(TARGET_DEVICE)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := ims
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_MODULE_OWNER := qcom
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := QtiTelephonyService
LOCAL_MODULE_TAGS := optional
@@ -13,3 +23,4 @@
LOCAL_CERTIFICATE := platform
include $(BUILD_PREBUILT)
endif
+
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index bef3733..129f30e 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -14,6 +14,7 @@
# AOSP packages required by the blobs
PRODUCT_PACKAGES := \
+ ims \
QtiTelephonyService
# blob(s) necessary for bonito hardware
diff --git a/self-extractors_sargo/extract-lists.txt b/self-extractors_sargo/extract-lists.txt
index fb7abcd..b963792 100644
--- a/self-extractors_sargo/extract-lists.txt
+++ b/self-extractors_sargo/extract-lists.txt
@@ -5,6 +5,7 @@
;;
qcom)
TO_EXTRACT="\
+ system/app/ims/ims.apk \
system/app/QtiTelephonyService/QtiTelephonyService.apk \
system/etc/cne/andsfCne.xml \
system/etc/permissions/cneapiclient.xml \
diff --git a/self-extractors_sargo/qcom/staging/Android.mk b/self-extractors_sargo/qcom/staging/Android.mk
index 9d06c02..9d76fef 100644
--- a/self-extractors_sargo/qcom/staging/Android.mk
+++ b/self-extractors_sargo/qcom/staging/Android.mk
@@ -1,8 +1,18 @@
LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
ifneq ($(filter sargo, $(TARGET_DEVICE)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := ims
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_MODULE_OWNER := qcom
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := QtiTelephonyService
LOCAL_MODULE_TAGS := optional
@@ -13,4 +23,3 @@
LOCAL_CERTIFICATE := platform
include $(BUILD_PREBUILT)
endif
-
diff --git a/self-extractors_sargo/qcom/staging/device-partial.mk b/self-extractors_sargo/qcom/staging/device-partial.mk
index f15a9de..428600c 100644
--- a/self-extractors_sargo/qcom/staging/device-partial.mk
+++ b/self-extractors_sargo/qcom/staging/device-partial.mk
@@ -14,6 +14,7 @@
# AOSP packages required by the blobs
PRODUCT_PACKAGES := \
+ ims \
QtiTelephonyService
# blob(s) necessary for sargo hardware
