Import translations. DO NOT MERGE

[android-x86/frameworks-base.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index f45f977..d684cd3 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -78,8 +78,9 @@ LOCAL_SRC_FILES += \
        core/java/android/app/IThumbnailReceiver.aidl \
        core/java/android/app/IThumbnailRetriever.aidl \
        core/java/android/app/ITransientNotification.aidl \
+       core/java/android/app/IUiAutomationConnection.aidl \
        core/java/android/app/IUiModeManager.aidl \
-    core/java/android/app/IUserSwitchObserver.aidl \
+       core/java/android/app/IUserSwitchObserver.aidl \
        core/java/android/app/IWallpaperManager.aidl \
        core/java/android/app/IWallpaperManagerCallback.aidl \
        core/java/android/app/admin/IDevicePolicyManager.aidl \
@@ -219,10 +220,7 @@ LOCAL_SRC_FILES += \
        telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
        telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
        wifi/java/android/net/wifi/IWifiManager.aidl \
-       wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
-       voip/java/android/net/sip/ISipSession.aidl \
-       voip/java/android/net/sip/ISipSessionListener.aidl \
-       voip/java/android/net/sip/ISipService.aidl
+       wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl
 #
 
 
@@ -353,6 +351,8 @@ non_base_dirs := \
        ../../external/apache-http/src/org/apache/http \
        ../opt/telephony/src/java/android/telephony \
        ../opt/telephony/src/java/android/telephony/gsm \
+       ../opt/net/voip/src/java/android/net/rtp \
+       ../opt/net/voip/src/java/android/net/sip
 
 # These are relative to frameworks/base
 dirs_to_check_apis := \
@@ -405,6 +405,7 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \
                        framework \
                        mms-common \
                        telephony-common \
+                       voip-common \
 
 framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html