Add telephony-common, ims-common to telephony apex.
Test: basic telephony sanity
Test: m com.android.telephony && adb install com.android.telephony.apex
Bug: 145555313
Change-Id: I81e922c0dfe586e6bedb21ad249bc358b7f3e692
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1321ace..22845e0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -48,3 +48,5 @@
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.services.telephony.common_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/telephony-common.jar)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/ims-common.jar)
diff --git a/apex/Android.bp b/apex/Android.bp
index 4985f40..86ebe3a 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -6,7 +6,7 @@
// optional. if unspecified, a default one is auto-generated
androidManifest: "AndroidManifest.xml",
- //java_libs: ["telephony-common", "ims-common", "voip-common"],
+ java_libs: ["telephony-common", "ims-common"],
//apps: ["TeleService", "StkLib", "ONSLib"],
apps: ["StkLib"],
@@ -25,4 +25,4 @@
// This will use com.android.telephony.x509.pem (the cert) and
// com.android.telephony.pk8 (the private key)
certificate: "com.android.telephony",
-}
\ No newline at end of file
+}