release-request-513a9883-0d18-4c2f-80ce-cadb234b4e89-for-git_nyc-mr2-pixel-monthly...

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

diff --git a/Android.mk b/Android.mk
index f433494..730eeb1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -75,6 +75,7 @@ LOCAL_SRC_FILES += \
        core/java/android/app/IAppTask.aidl \
        core/java/android/app/ITaskStackListener.aidl \
        core/java/android/app/IBackupAgent.aidl \
+       core/java/android/app/IEphemeralResolver.aidl \
        core/java/android/app/IInstrumentationWatcher.aidl \
        core/java/android/app/INotificationManager.aidl \
        core/java/android/app/IProcessObserver.aidl \
@@ -198,8 +199,10 @@ LOCAL_SRC_FILES += \
        core/java/android/net/ICaptivePortal.aidl \
        core/java/android/net/IConnectivityManager.aidl \
        core/java/android/net/IConnectivityMetricsLogger.aidl \
+       core/java/android/net/IIpConnectivityMetrics.aidl \
        core/java/android/net/IEthernetManager.aidl \
        core/java/android/net/IEthernetServiceListener.aidl \
+       core/java/android/net/INetdEventCallback.aidl \
        core/java/android/net/INetworkManagementEventObserver.aidl \
        core/java/android/net/INetworkPolicyListener.aidl \
        core/java/android/net/INetworkPolicyManager.aidl \
@@ -305,9 +308,9 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/app/IAppOpsService.aidl \
        core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl \
        core/java/com/android/internal/app/IBatteryStats.aidl \
-       core/java/com/android/internal/app/IEphemeralResolver.aidl \
        core/java/com/android/internal/app/ISoundTriggerService.aidl \
        core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \
+       core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl \
        core/java/com/android/internal/app/IVoiceInteractionSessionShowCallback.aidl \
        core/java/com/android/internal/app/IVoiceInteractor.aidl \
        core/java/com/android/internal/app/IVoiceInteractorCallback.aidl \
@@ -318,6 +321,7 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \
        core/java/com/android/internal/backup/IBackupTransport.aidl \
        core/java/com/android/internal/backup/IObbBackupService.aidl \
+       core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl \
        core/java/com/android/internal/policy/IKeyguardDrawnCallback.aidl \
        core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \
        core/java/com/android/internal/policy/IKeyguardService.aidl \
@@ -341,6 +345,7 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/view/IInputMethodManager.aidl \
        core/java/com/android/internal/view/IInputMethodSession.aidl \
        core/java/com/android/internal/view/IInputSessionCallback.aidl \
+       core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl \
        core/java/com/android/internal/widget/ILockSettings.aidl \
        core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
        core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \
@@ -467,6 +472,9 @@ LOCAL_SRC_FILES += \
        ../../system/update_engine/binder_bindings/android/os/IUpdateEngine.aidl \
        ../../system/update_engine/binder_bindings/android/os/IUpdateEngineCallback.aidl \
 
+LOCAL_SRC_FILES +=  \
+       ../../system/netd/server/binder/android/net/INetd.aidl \
+
 LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings
 
 # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
@@ -567,6 +575,9 @@ aidl_files := \
        frameworks/base/graphics/java/android/graphics/drawable/Icon.aidl \
        frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \
        frameworks/base/core/java/android/accounts/Account.aidl \
+       frameworks/base/core/java/android/app/admin/ConnectEvent.aidl \
+       frameworks/base/core/java/android/app/admin/DnsEvent.aidl \
+       frameworks/base/core/java/android/app/admin/NetworkEvent.aidl \
        frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \
        frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \
        frameworks/base/core/java/android/print/PageRange.aidl \
@@ -699,6 +710,7 @@ aidl_files := \
        frameworks/base/core/java/android/service/quicksettings/Tile.aidl \
        frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \
        system/netd/server/binder/android/net/UidRange.aidl \
+       frameworks/base/telephony/java/android/telephony/PcoData.aidl \
 
 gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
 $(gen): PRIVATE_SRC_FILES := $(aidl_files)
@@ -852,6 +864,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
     -since $(SRC_API_DIR)/22.txt 22 \
     -since $(SRC_API_DIR)/23.txt 23 \
     -since $(SRC_API_DIR)/24.txt 24 \
+    -since $(SRC_API_DIR)/25.txt 25 \
                -werror -hide 111 -hide 113 \
                -overview $(LOCAL_PATH)/core/java/overview.html