AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE

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

diff --git a/Android.mk b/Android.mk
index da98b19..0ba92cf 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -69,6 +69,7 @@ LOCAL_SRC_FILES += \
        core/java/android/app/IActivityPendingResult.aidl \
        core/java/android/app/IAlarmManager.aidl \
        core/java/android/app/IAppTask.aidl \
+       core/java/android/app/ITaskStackListener.aidl \
        core/java/android/app/IBackupAgent.aidl \
        core/java/android/app/IInstrumentationWatcher.aidl \
        core/java/android/app/INotificationManager.aidl \
@@ -99,6 +100,7 @@ LOCAL_SRC_FILES += \
        core/java/android/bluetooth/IBluetoothA2dpSink.aidl \
        core/java/android/bluetooth/IBluetoothAvrcpController.aidl \
        core/java/android/bluetooth/IBluetoothCallback.aidl \
+       core/java/android/bluetooth/IBluetoothProfileServiceConnection.aidl \
        core/java/android/bluetooth/IBluetoothHeadset.aidl \
        core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \
        core/java/android/bluetooth/IBluetoothHealth.aidl \
@@ -174,6 +176,7 @@ LOCAL_SRC_FILES += \
        core/java/android/hardware/usb/IUsbManager.aidl \
        core/java/android/net/IConnectivityManager.aidl \
        core/java/android/net/IEthernetManager.aidl \
+       core/java/android/net/IEthernetServiceListener.aidl \
        core/java/android/net/INetworkManagementEventObserver.aidl \
        core/java/android/net/INetworkPolicyListener.aidl \
        core/java/android/net/INetworkPolicyManager.aidl \
@@ -202,6 +205,8 @@ LOCAL_SRC_FILES += \
        core/java/android/os/IUpdateLock.aidl \
        core/java/android/os/IUserManager.aidl \
        core/java/android/os/IVibratorService.aidl \
+       core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
+       core/java/android/service/carrier/ICarrierMessagingService.aidl \
        core/java/android/service/notification/INotificationListener.aidl \
        core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
        core/java/android/service/notification/IConditionListener.aidl \
@@ -270,6 +275,7 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/policy/IKeyguardShowCallback.aidl \
        core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \
        core/java/com/android/internal/policy/IKeyguardService.aidl \
+       core/java/com/android/internal/policy/IKeyguardStateCallback.aidl \
        core/java/com/android/internal/os/IDropBoxManagerService.aidl \
        core/java/com/android/internal/os/IParcelFileDescriptorFactory.aidl \
        core/java/com/android/internal/os/IResultReceiver.aidl \
@@ -288,7 +294,6 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/view/IInputMethodSession.aidl \
        core/java/com/android/internal/view/IInputSessionCallback.aidl \
        core/java/com/android/internal/widget/ILockSettings.aidl \
-       core/java/com/android/internal/widget/ILockSettingsObserver.aidl \
        core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
        core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \
        keystore/java/android/security/IKeyChainAliasCallback.aidl \
@@ -325,6 +330,7 @@ LOCAL_SRC_FILES += \
        media/java/android/media/IRemoteVolumeObserver.aidl \
        media/java/android/media/IRingtonePlayer.aidl \
        media/java/android/media/IVolumeController.aidl \
+        media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \
        media/java/android/media/projection/IMediaProjection.aidl \
        media/java/android/media/projection/IMediaProjectionCallback.aidl \
        media/java/android/media/projection/IMediaProjectionManager.aidl \
@@ -371,6 +377,7 @@ LOCAL_SRC_FILES += \
        telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
        telephony/java/com/android/internal/telephony/ITelephony.aidl \
        telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
+       telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \
        telephony/java/com/android/internal/telephony/ISms.aidl \
        telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
        telephony/java/com/android/internal/telephony/ISub.aidl \
@@ -400,9 +407,6 @@ LOCAL_DX_FLAGS := --core-library --multi-dex
 
 LOCAL_RMTYPEDEFS := true
 
-# List of classes and interfaces which should be loaded by the Zygote.
-LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
-
 include $(BUILD_JAVA_LIBRARY)
 framework_module := $(LOCAL_INSTALLED_MODULE)
 
@@ -434,6 +438,7 @@ aidl_files := \
        frameworks/base/media/java/android/media/MediaDescription.aidl \
        frameworks/base/media/java/android/media/Rating.aidl \
        frameworks/base/media/java/android/media/AudioAttributes.aidl \
+       frameworks/base/media/java/android/media/AudioFocusInfo.aidl \
        frameworks/base/media/java/android/media/session/PlaybackState.aidl \
        frameworks/base/media/java/android/media/session/MediaSession.aidl \
        frameworks/base/media/java/android/media/tv/TvInputInfo.aidl \
@@ -522,6 +527,7 @@ aidl_files := \
        frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \
        frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \
        frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
+       frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
        frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
        frameworks/base/core/java/android/speech/tts/Voice.aidl \
        frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
@@ -559,6 +565,7 @@ aidl_files := \
        frameworks/base/core/java/android/content/pm/ProviderInfo.aidl \
        frameworks/base/core/java/android/content/pm/PackageStats.aidl \
        frameworks/base/core/java/android/content/pm/PermissionGroupInfo.aidl \
+       frameworks/base/core/java/android/content/pm/LabeledIntent.aidl \
        frameworks/base/core/java/android/content/ComponentName.aidl \
        frameworks/base/core/java/android/content/SyncStats.aidl \
        frameworks/base/core/java/android/content/ContentValues.aidl \
@@ -813,6 +820,11 @@ LOCAL_UNINSTALLABLE_MODULE := true
 
 include $(BUILD_DROIDDOC)
 
+# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
+$(full_target): $(framework_built) $(gen)
+$(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target)
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))
+
 # ====  check javadoc comments but don't generate docs ========
 include $(CLEAR_VARS)