From ecbc5f5ee91734c239524d47cccfc8ff4d1e421b Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Wed, 11 Sep 2019 14:00:54 -0700
Subject: [PATCH] Move nist-sip from ext.jar to voip-common.jar

No component other than voip-common uses it.

Test: basic sanity
Bug: 140872785

Merged-in: Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a
Change-Id: Ie8c9a7266d1ed9ea67b43c9267610e236b6e547a
(cherry picked from commit 18f58774364b304415a407e6212152971315ff20)
---
 Android.bp   | 1 -
 CleanSpec.mk | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index f6bf0ed6ccda2..77f024bab01ef 100644
--- a/Android.bp
+++ b/Android.bp
@@ -516,7 +516,6 @@ java_library {
     sdk_version: "core_platform",
     static_libs: [
         "libphonenumber-platform",
-        "nist-sip",
         "tagsoup",
         "rappor",
         "libtextclassifier-java",
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f311fc81fc10c..6a909c0364e91 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -253,6 +253,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerService)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/ext.jar)
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
 # ******************************************************************