diff options
| author | Andy McFadden <fadden@android.com> | 2011-11-15 16:22:44 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2011-11-15 16:22:44 -0800 |
| commit | 8d8d7cf86ebf7e34dc42dab0bfbe3930ad95f983 (patch) | |
| tree | 7b62edc3100517b04500930b413e41db205722e0 | |
| parent | b2c9185bf64d9ddf1c0959fbefe6ed8cb99d4c2d (diff) | |
| download | calendar-8d8d7cf86ebf7e34dc42dab0bfbe3930ad95f983.tar.gz | |
Stop including libphonenumber
No longer used by Calendar app.
Bug 5578068
Change-Id: I7d7b51ac334f7dee7fbca7748a3c461f04f6b126
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | jarjar-rules.txt | 1 |
3 files changed, 2 insertions, 10 deletions
@@ -17,15 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := calendar-common LOCAL_SDK_VERSION := current - -# We want to use libphonenumber in the app. It's a private API, which means -# we can't use it directly from an unundled app, so we build a static copy -# here. Because it's also part of ext.jar, we need to rename its package, -# or the class loaders will favor the (possibly incompatible) framework copy. -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-java-files-under, ../../../external/libphonenumber/java/src) -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt +LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/CleanSpec.mk b/CleanSpec.mk index c2218be..da0345b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -39,6 +39,7 @@ # ************************************************ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/calendar-common_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/calendar-common_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/jarjar-rules.txt b/jarjar-rules.txt deleted file mode 100644 index 15045ba..0000000 --- a/jarjar-rules.txt +++ /dev/null @@ -1 +0,0 @@ -rule com.android.i18n.phonenumbers.** com.android.calendarcommon.phonenumbers.@1 |