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 e17a1dc..730eeb1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -199,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 \
@@ -573,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 \
@@ -859,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