summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amit Mahajan <amitmahajan@google.com> 2019-10-15 10:50:25 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-15 10:50:25 -0700
commit02a4c5ed582f31af3684d323f2324327c44685bf (patch)
treee86b1b9f13abdafbc0e21355791210f24ed62d12
parentcfa361edcaca81c05d0d06951a44c3f9b91767d4 (diff)
parentdd65089678f8dbdc5c3b47f758280e7c3c7c82e5 (diff)
Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201
am: dd65089678 Change-Id: Ica45e366d4413355f1081d25d1a3a942397dc1ac
-rw-r--r--Android.bp1
-rw-r--r--CleanSpec.mk1
2 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index f6bf0ed6ccda..77f024bab01e 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 f311fc81fc10..6a909c0364e9 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
# ******************************************************************