Fix the build before the bot yells at me.

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

diff --git a/Android.mk b/Android.mk
index 3768a5a..a98b1c2 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -60,14 +60,14 @@ LOCAL_SRC_FILES := $(filter-out \
 ## READ ME: ########################################################
 LOCAL_SRC_FILES += \
        core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl \
-       core/java/android/accessibilityservice/IEventListener.aidl \
+       core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl \
+       core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.aidl \
        core/java/android/accounts/IAccountManager.aidl \
        core/java/android/accounts/IAccountManagerResponse.aidl \
        core/java/android/accounts/IAccountAuthenticator.aidl \
        core/java/android/accounts/IAccountAuthenticatorResponse.aidl \
        core/java/android/app/IActivityController.aidl \
        core/java/android/app/IActivityPendingResult.aidl \
-       core/java/android/app/IActivityWatcher.aidl \
        core/java/android/app/IAlarmManager.aidl \
        core/java/android/app/IBackupAgent.aidl \
        core/java/android/app/IInstrumentationWatcher.aidl \
@@ -94,6 +94,7 @@ LOCAL_SRC_FILES += \
        core/java/android/bluetooth/IBluetoothHealthCallback.aidl \
        core/java/android/bluetooth/IBluetoothPbap.aidl \
        core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
+       core/java/android/content/ICancellationSignal.aidl \
        core/java/android/content/IClipboard.aidl \
        core/java/android/content/IContentService.aidl \
        core/java/android/content/IIntentReceiver.aidl \
@@ -110,6 +111,8 @@ LOCAL_SRC_FILES += \
        core/java/android/content/pm/IPackageStatsObserver.aidl \
        core/java/android/database/IContentObserver.aidl \
        core/java/android/hardware/ISerialManager.aidl \
+       core/java/android/hardware/input/IInputManager.aidl \
+       core/java/android/hardware/input/IInputDevicesChangedListener.aidl \
        core/java/android/hardware/usb/IUsbManager.aidl \
        core/java/android/net/IConnectivityManager.aidl \
        core/java/android/net/INetworkManagementEventObserver.aidl \
@@ -117,6 +120,8 @@ LOCAL_SRC_FILES += \
        core/java/android/net/INetworkPolicyListener.aidl \
        core/java/android/net/INetworkPolicyManager.aidl \
        core/java/android/net/INetworkStatsService.aidl \
+       core/java/android/net/INetworkStatsSession.aidl \
+       core/java/android/net/nsd/INsdManager.aidl \
        core/java/android/nfc/INdefPushCallback.aidl \
        core/java/android/nfc/INfcAdapter.aidl \
        core/java/android/nfc/INfcAdapterExtras.aidl \
@@ -129,6 +134,8 @@ LOCAL_SRC_FILES += \
        core/java/android/os/IRemoteCallback.aidl \
        core/java/android/os/IUpdateLock.aidl \
        core/java/android/os/IVibratorService.aidl \
+       core/java/android/service/dreams/IDreamManager.aidl \
+       core/java/android/service/dreams/IDreamService.aidl \
        core/java/android/service/wallpaper/IWallpaperConnection.aidl \
        core/java/android/service/wallpaper/IWallpaperEngine.aidl \
        core/java/android/service/wallpaper/IWallpaperService.aidl \
@@ -170,6 +177,7 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/view/IInputMethodClient.aidl \
        core/java/com/android/internal/view/IInputMethodManager.aidl \
        core/java/com/android/internal/view/IInputMethodSession.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 \
        keystore/java/android/security/IKeyChainAliasCallback.aidl \
@@ -322,10 +330,10 @@ fwbase_dirs_to_document := \
         )
 
 # include definition of libcore_to_document
-include $(LOCAL_PATH)/../../libcore/Docs.mk
+include libcore/Docs.mk
 
-# include definition of libfilterfw_to_document
-include $(LOCAL_PATH)/../../system/media/mca/Docs.mk
+# include definition of junit_to_document
+include external/junit/Common.mk
 
 non_base_dirs := \
        ../../external/apache-http/src/org/apache/http
@@ -350,7 +358,7 @@ html_dirs := \
 common_src_files := \
        $(call find-other-html-files, $(html_dirs)) \
        $(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
-       $(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) \
+       $(addprefix ../../external/junit/, $(call junit_to_document, $(LOCAL_PATH)/../../external/junit))
 
 # These are relative to frameworks/base
 framework_docs_LOCAL_SRC_FILES := \
@@ -453,8 +461,6 @@ web_docs_sample_code_flags := \
                            resources/samples/training/ads-and-ux "Mobile Advertisement Integration" \
                -samplecode $(sample_dir)/MultiResolution \
                            resources/samples/MultiResolution "Multiple Resolutions" \
-               -samplecode $(sample_dir)/NFCDemo \
-                           resources/samples/NFCDemo "NFC Demo" \
                -samplecode $(sample_dir)/training/multiscreen/newsreader \
                            resources/samples/newsreader "News Reader" \
                -samplecode $(sample_dir)/NotePad \