summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-07-10 12:37:54 -0700
committerWink Saville <wink@google.com>2012-07-11 16:02:08 -0700
commita639b311e93ad14d9ee5c2b2c215ed2d86c32d2a (patch)
tree8fc3e0698132d5fdba03726a1468fefa18dd2a02 /Android.mk
parent64ab8fcd6f2011c0d185f2973b9615f155f6d239 (diff)
downloadframeworks_base-a639b311e93ad14d9ee5c2b2c215ed2d86c32d2a.zip
frameworks_base-a639b311e93ad14d9ee5c2b2c215ed2d86c32d2a.tar.gz
frameworks_base-a639b311e93ad14d9ee5c2b2c215ed2d86c32d2a.tar.bz2
Create telephony-common and mms-common
These have been created to reduce the size and complexity of frameworks/base. mms-common was created by moving all of frameworks/base/core/java/com/google/android/mms to: frameworks/opt/mms telephony-common was created by moving some of frameworks/base/telephony to: frameworks/opt/telephony Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 4d567df..b9157fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,7 +38,6 @@ LOCAL_SRC_FILES += \
core/java/android/content/EventLogTags.logtags \
core/java/android/speech/tts/EventLogTags.logtags \
core/java/android/webkit/EventLogTags.logtags \
- telephony/java/com/android/internal/telephony/EventLogTags.logtags \
# The following filters out code we are temporarily not including at all.
# TODO: Move AWT and beans (and associated harmony code) back into libcore.
@@ -204,12 +203,10 @@ LOCAL_SRC_FILES += \
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
telephony/java/com/android/internal/telephony/ITelephony.aidl \
telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
- telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \
- telephony/java/com/android/internal/telephony/ISms.aidl \
telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
+ telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
wifi/java/android/net/wifi/IWifiManager.aidl \
wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
- telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
voip/java/android/net/sip/ISipSession.aidl \
voip/java/android/net/sip/ISipSessionListener.aidl \
voip/java/android/net/sip/ISipService.aidl
@@ -339,7 +336,9 @@ include libcore/Docs.mk
include external/junit/Common.mk
non_base_dirs := \
- ../../external/apache-http/src/org/apache/http
+ ../../external/apache-http/src/org/apache/http \
+ ../opt/telephony/src/java/android/telephony \
+ ../opt/telephony/src/java/android/telephony/gsm \
# These are relative to frameworks/base
dirs_to_check_apis := \
@@ -390,6 +389,8 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
core \
ext \
framework \
+ mms-common \
+ telephony-common \
framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html