summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amit Mahajan <amitmahajan@google.com> 2019-10-15 11:17:14 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-15 11:17:14 -0700
commitfe418b9d0435eb23198d3142764a626e991c782c (patch)
tree3e729952a77c5426cac43b6e0964bbe91b9f1fff
parent853445d1a990e8dc4c5d6034ed163af9ee28e024 (diff)
parent02a4c5ed582f31af3684d323f2324327c44685bf (diff)
Merge "Move nist-sip from ext.jar to voip-common.jar" am: 1656b2b201 am: dd65089678
am: 02a4c5ed58 Change-Id: Ib6869d36e2b0b4e8a079f4f6f3c2bbaa50b30be1
-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
# ******************************************************************