Merge "Make --no-window-animation flag apply to animators, too" into oc-dev am: c36e3...

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

diff --git a/Android.mk b/Android.mk
index 7137cd8..933ac62 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -159,6 +159,7 @@ LOCAL_SRC_FILES += \
        core/java/android/content/ISyncServiceAdapter.aidl \
        core/java/android/content/ISyncStatusObserver.aidl \
        core/java/android/content/om/IOverlayManager.aidl \
+       core/java/android/content/pm/IDexModuleRegisterCallback.aidl \
        core/java/android/content/pm/ILauncherApps.aidl \
        core/java/android/content/pm/IOnAppsChangedListener.aidl \
        core/java/android/content/pm/IOnPermissionsChangeListener.aidl \
@@ -217,6 +218,9 @@ LOCAL_SRC_FILES += \
        core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \
        core/java/android/hardware/location/IContextHubCallback.aidl \
        core/java/android/hardware/location/IContextHubService.aidl \
+       core/java/android/hardware/radio/IRadioService.aidl \
+       core/java/android/hardware/radio/ITuner.aidl \
+       core/java/android/hardware/radio/ITunerCallback.aidl \
        core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \
        core/java/android/hardware/usb/IUsbManager.aidl \
        core/java/android/net/ICaptivePortal.aidl \
@@ -279,6 +283,17 @@ LOCAL_SRC_FILES += \
        core/java/android/service/carrier/ICarrierService.aidl \
        core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
        core/java/android/service/carrier/ICarrierMessagingService.aidl \
+       core/java/android/service/euicc/IDeleteSubscriptionCallback.aidl \
+       core/java/android/service/euicc/IDownloadSubscriptionCallback.aidl \
+       core/java/android/service/euicc/IEraseSubscriptionsCallback.aidl \
+       core/java/android/service/euicc/IEuiccService.aidl \
+       core/java/android/service/euicc/IGetDefaultDownloadableSubscriptionListCallback.aidl \
+       core/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl \
+       core/java/android/service/euicc/IGetEidCallback.aidl \
+       core/java/android/service/euicc/IGetEuiccInfoCallback.aidl \
+       core/java/android/service/euicc/IGetEuiccProfileInfoListCallback.aidl \
+       core/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl \
+       core/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl \
        core/java/android/service/gatekeeper/IGateKeeperService.aidl \
        core/java/android/service/notification/INotificationListener.aidl \
        core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
@@ -342,6 +357,7 @@ LOCAL_SRC_FILES += \
        core/java/android/view/IPinnedStackController.aidl \
        core/java/android/view/IPinnedStackListener.aidl \
        core/java/android/view/IRotationWatcher.aidl \
+       core/java/android/view/IWallpaperVisibilityListener.aidl \
        core/java/android/view/IWindow.aidl \
        core/java/android/view/IWindowFocusObserver.aidl \
        core/java/android/view/IWindowId.aidl \
@@ -370,6 +386,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/car/ICarServiceHelper.aidl \
        core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl \
        core/java/com/android/internal/policy/IKeyguardDrawnCallback.aidl \
        core/java/com/android/internal/policy/IKeyguardDismissCallback.aidl \
@@ -525,6 +542,7 @@ LOCAL_SRC_FILES += \
        telephony/java/com/android/internal/telephony/ITelephony.aidl \
        telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
        telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
+       telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl \
        wifi/java/android/net/wifi/IWifiManager.aidl \
        wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl \
        wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl \
@@ -550,6 +568,15 @@ LOCAL_SRC_FILES += \
 
 LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings
 
+LOCAL_AIDL_INCLUDES += frameworks/base/lowpan/java
+LOCAL_SRC_FILES += \
+       lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl \
+       lowpan/java/android/net/lowpan/ILowpanNetScanCallback.aidl \
+       lowpan/java/android/net/lowpan/ILowpanInterfaceListener.aidl \
+       lowpan/java/android/net/lowpan/ILowpanInterface.aidl \
+       lowpan/java/android/net/lowpan/ILowpanManagerListener.aidl \
+       lowpan/java/android/net/lowpan/ILowpanManager.aidl
+
 # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
 LOCAL_AIDL_INCLUDES += \
       $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \
@@ -581,7 +608,10 @@ LOCAL_STATIC_JAVA_LIBRARIES :=                          \
     android.hardware.thermal-V1.0-java-constants         \
     android.hardware.tv.input-V1.0-java-constants        \
     android.hardware.usb-V1.0-java-constants             \
+    android.hardware.usb-V1.1-java-constants             \
     android.hardware.vibrator-V1.0-java-constants        \
+    android.hardware.vibrator-V1.1-java-constants        \
+    android.hardware.wifi-V1.0-java-constants            \
 
 # Loaded with System.loadLibrary by android.view.textclassifier
 LOCAL_REQUIRED_MODULES += libtextclassifier
@@ -627,6 +657,9 @@ aidl_files := \
        frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
        frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
        frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \
+       frameworks/base/telephony/java/android/telephony/UiccAccessRule.aidl \
+       frameworks/base/telephony/java/android/telephony/euicc/DownloadableSubscription.aidl \
+       frameworks/base/telephony/java/android/telephony/euicc/EuiccInfo.aidl \
        frameworks/base/location/java/android/location/Location.aidl \
        frameworks/base/location/java/android/location/Address.aidl \
        frameworks/base/location/java/android/location/Criteria.aidl \
@@ -680,6 +713,7 @@ aidl_files := \
        frameworks/base/core/java/android/print/PrinterInfo.aidl \
        frameworks/base/core/java/android/print/PrintJobId.aidl \
        frameworks/base/core/java/android/printservice/recommendation/RecommendationInfo.aidl \
+       frameworks/base/core/java/android/hardware/radio/RadioManager.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \
@@ -739,6 +773,9 @@ aidl_files := \
        frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
        frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \
        frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
+       frameworks/base/core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.aidl \
+       frameworks/base/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.aidl \
+       frameworks/base/core/java/android/service/euicc/GetEuiccProfileInfoListResult.aidl \
        frameworks/base/core/java/android/service/notification/Adjustment.aidl \
        frameworks/base/core/java/android/service/notification/Condition.aidl \
        frameworks/base/core/java/android/service/notification/SnoozeCriterion.aidl \