Add IApnSourceService.aidl

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

diff --git a/Android.mk b/Android.mk
index a2d70ce..5f759cb 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -103,6 +103,8 @@ LOCAL_SRC_FILES += \
        core/java/android/app/backup/IFullBackupRestoreObserver.aidl \
        core/java/android/app/backup/IRestoreObserver.aidl \
        core/java/android/app/backup/IRestoreSession.aidl \
+       core/java/android/app/timezone/ICallback.aidl \
+       core/java/android/app/timezone/IRulesManager.aidl \
        core/java/android/app/usage/IUsageStatsManager.aidl \
        core/java/android/bluetooth/IBluetooth.aidl \
        core/java/android/bluetooth/IBluetoothA2dp.aidl \
@@ -130,7 +132,6 @@ LOCAL_SRC_FILES += \
        core/java/android/bluetooth/IBluetoothGatt.aidl \
        core/java/android/bluetooth/IBluetoothGattCallback.aidl \
        core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \
-       core/java/android/bluetooth/le/IAdvertiserCallback.aidl \
        core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl \
        core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \
        core/java/android/bluetooth/le/IScannerCallback.aidl \
@@ -433,10 +434,10 @@ LOCAL_SRC_FILES += \
        telecomm/java/com/android/internal/telecom/IInCallService.aidl \
        telecomm/java/com/android/internal/telecom/ITelecomService.aidl \
        telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \
-        telephony/java/android/telephony/mbms/IMbmsDownloadManagerListener.aidl \
-       telephony/java/android/telephony/mbms/IMbmsStreamingManagerListener.aidl \
-       telephony/java/android/telephony/mbms/IDownloadListener.aidl \
-        telephony/java/android/telephony/mbms/IStreamingServiceListener.aidl \
+        telephony/java/android/telephony/mbms/IMbmsDownloadManagerCallback.aidl \
+       telephony/java/android/telephony/mbms/IMbmsStreamingManagerCallback.aidl \
+       telephony/java/android/telephony/mbms/IDownloadCallback.aidl \
+        telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \
        telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \
        telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \
        telephony/java/com/android/ims/internal/IImsCallSession.aidl \
@@ -463,6 +464,7 @@ LOCAL_SRC_FILES += \
         telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl \
         telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl \
        telephony/java/com/android/ims/ImsConfigListener.aidl \
+       telephony/java/com/android/internal/telephony/IApnSourceService.aidl \
        telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl \
        telephony/java/com/android/internal/telephony/IMms.aidl \
        telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \
@@ -552,7 +554,6 @@ aidl_files := \
         frameworks/base/telephony/java/android/telephony/mbms/FileInfo.aidl \
         frameworks/base/telephony/java/android/telephony/mbms/FileServiceInfo.aidl \
         frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \
-       frameworks/base/telephony/java/android/telephony/mbms/StreamingService.aidl \
         frameworks/base/telephony/java/android/telephony/mbms/StreamingServiceInfo.aidl \
        frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
        frameworks/base/telephony/java/android/telephony/SubscriptionInfo.aidl \
@@ -772,7 +773,6 @@ fwbase_dirs_to_document := \
 include libcore/Docs.mk
 
 non_base_dirs := \
-       ../opt/telephony/src/java/android/provider \
        ../opt/telephony/src/java/android/telephony \
        ../opt/telephony/src/java/android/telephony/gsm \
        ../opt/net/voip/src/java/android/net/rtp \