am 91725e78: am 3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev

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

diff --git a/Android.mk b/Android.mk
index 449ae1b..b71f08c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -45,6 +45,7 @@ LOCAL_SRC_FILES += \
        core/java/android/content/EventLogTags.logtags \
        core/java/android/speech/tts/EventLogTags.logtags \
        core/java/android/webkit/EventLogTags.logtags \
+       core/java/com/android/internal/logging/EventLogTags.logtags \
 
 ## READ ME: ########################################################
 ##
@@ -73,6 +74,7 @@ LOCAL_SRC_FILES += \
        core/java/android/app/IBackupAgent.aidl \
        core/java/android/app/IInstrumentationWatcher.aidl \
        core/java/android/app/INotificationManager.aidl \
+       core/java/android/app/INotificationManagerCallback.aidl \
        core/java/android/app/IProcessObserver.aidl \
        core/java/android/app/ISearchManager.aidl \
        core/java/android/app/ISearchManagerCallback.aidl \
@@ -111,6 +113,7 @@ LOCAL_SRC_FILES += \
        core/java/android/bluetooth/IBluetoothManagerCallback.aidl \
        core/java/android/bluetooth/IBluetoothPbap.aidl \
        core/java/android/bluetooth/IBluetoothMap.aidl \
+       core/java/android/bluetooth/IBluetoothSap.aidl \
        core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
        core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \
        core/java/android/bluetooth/IBluetoothGatt.aidl \
@@ -145,14 +148,14 @@ LOCAL_SRC_FILES += \
        core/java/android/hardware/ICamera.aidl \
        core/java/android/hardware/ICameraClient.aidl \
        core/java/android/hardware/IConsumerIrService.aidl \
-       core/java/android/hardware/IProCameraUser.aidl \
-       core/java/android/hardware/IProCameraCallbacks.aidl \
        core/java/android/hardware/camera2/ICameraDeviceUser.aidl \
        core/java/android/hardware/camera2/ICameraDeviceCallbacks.aidl \
        core/java/android/hardware/ISerialManager.aidl \
        core/java/android/hardware/display/IDisplayManager.aidl \
        core/java/android/hardware/display/IDisplayManagerCallback.aidl \
        core/java/android/hardware/display/IVirtualDisplayCallback.aidl \
+       core/java/android/hardware/fingerprint/IFingerprintService.aidl \
+       core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl \
        core/java/android/hardware/hdmi/IHdmiControlCallback.aidl \
        core/java/android/hardware/hdmi/IHdmiControlService.aidl \
        core/java/android/hardware/hdmi/IHdmiDeviceEventListener.aidl \
@@ -194,7 +197,7 @@ LOCAL_SRC_FILES += \
        core/java/android/os/IBatteryPropertiesListener.aidl \
        core/java/android/os/IBatteryPropertiesRegistrar.aidl \
        core/java/android/os/ICancellationSignal.aidl \
-       core/java/android/os/IHardwareService.aidl \
+       core/java/android/os/IDeviceIdleController.aidl \
        core/java/android/os/IMessenger.aidl \
        core/java/android/os/INetworkActivityListener.aidl \
        core/java/android/os/INetworkManagementService.aidl \
@@ -207,8 +210,10 @@ LOCAL_SRC_FILES += \
        core/java/android/os/IUserManager.aidl \
        core/java/android/os/IVibratorService.aidl \
        core/java/android/security/IKeystoreService.aidl \
+       core/java/android/service/carrier/ICarrierConfigService.aidl \
        core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
        core/java/android/service/carrier/ICarrierMessagingService.aidl \
+       core/java/android/service/gatekeeper/IGateKeeperService.aidl \
        core/java/android/service/notification/INotificationListener.aidl \
        core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
        core/java/android/service/notification/IConditionListener.aidl \
@@ -228,8 +233,6 @@ LOCAL_SRC_FILES += \
        core/java/android/service/dreams/IDreamManager.aidl \
        core/java/android/service/dreams/IDreamService.aidl \
        core/java/android/service/persistentdata/IPersistentDataBlockService.aidl \
-       core/java/android/service/fingerprint/IFingerprintService.aidl \
-       core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl \
        core/java/android/service/trust/ITrustAgentService.aidl \
        core/java/android/service/trust/ITrustAgentServiceCallback.aidl \
        core/java/android/service/voice/IVoiceInteractionService.aidl \
@@ -238,12 +241,15 @@ LOCAL_SRC_FILES += \
        core/java/android/service/wallpaper/IWallpaperConnection.aidl \
        core/java/android/service/wallpaper/IWallpaperEngine.aidl \
        core/java/android/service/wallpaper/IWallpaperService.aidl \
+       core/java/android/service/chooser/IChooserTargetService.aidl \
+       core/java/android/service/chooser/IChooserTargetResult.aidl \
        core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl\
        core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl\
        core/java/android/view/accessibility/IAccessibilityManager.aidl \
        core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
        core/java/android/view/IApplicationToken.aidl \
        core/java/android/view/IAssetAtlas.aidl \
+       core/java/android/view/IGraphicsStats.aidl \
        core/java/android/view/IInputFilter.aidl \
        core/java/android/view/IInputFilterHost.aidl \
        core/java/android/view/IOnKeyguardExitResult.aidl \
@@ -261,9 +267,11 @@ LOCAL_SRC_FILES += \
        core/java/android/speech/tts/ITextToSpeechService.aidl \
        core/java/com/android/internal/app/IAppOpsCallback.aidl \
        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/IProcessStats.aidl \
        core/java/com/android/internal/app/IVoiceInteractionManagerService.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 \
        core/java/com/android/internal/app/IVoiceInteractorRequest.aidl \
@@ -332,11 +340,20 @@ 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/audiopolicy/IAudioPolicyCallback.aidl \
+       media/java/android/media/midi/IMidiDeviceListener.aidl \
+       media/java/android/media/midi/IMidiDeviceServer.aidl \
+       media/java/android/media/midi/IMidiManager.aidl \
        media/java/android/media/projection/IMediaProjection.aidl \
        media/java/android/media/projection/IMediaProjectionCallback.aidl \
        media/java/android/media/projection/IMediaProjectionManager.aidl \
        media/java/android/media/projection/IMediaProjectionWatcherCallback.aidl \
+       media/java/android/media/routing/IMediaRouteService.aidl \
+       media/java/android/media/routing/IMediaRouteClientCallback.aidl \
+       media/java/android/media/routing/IMediaRouter.aidl \
+       media/java/android/media/routing/IMediaRouterDelegate.aidl \
+       media/java/android/media/routing/IMediaRouterRoutingCallback.aidl \
+       media/java/android/media/routing/IMediaRouterStateCallback.aidl \
        media/java/android/media/session/IActiveSessionsListener.aidl \
        media/java/android/media/session/ISessionController.aidl \
        media/java/android/media/session/ISessionControllerCallback.aidl \
@@ -375,16 +392,18 @@ LOCAL_SRC_FILES += \
        telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl \
        telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl \
        telephony/java/com/android/ims/ImsConfigListener.aidl \
+       telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl \
+       telephony/java/com/android/internal/telephony/IMms.aidl \
+       telephony/java/com/android/internal/telephony/IOnSubscriptionsChangedListener.aidl \
        telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \
        telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
+       telephony/java/com/android/internal/telephony/ISms.aidl \
+       telephony/java/com/android/internal/telephony/ISub.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 \
-       telephony/java/com/android/internal/telephony/IMms.aidl \
        wifi/java/android/net/wifi/IWifiManager.aidl \
+       wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \
        wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
        wifi/java/android/net/wifi/IWifiScanner.aidl \
        wifi/java/android/net/wifi/IRttManager.aidl \
@@ -406,6 +425,7 @@ LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext
 LOCAL_MODULE := framework
 
 LOCAL_DX_FLAGS := --core-library --multi-dex
+LOCAL_JACK_FLAGS := --multi-dex native
 
 LOCAL_RMTYPEDEFS := true
 
@@ -417,6 +437,7 @@ framework_module := $(LOCAL_INSTALLED_MODULE)
 framework_res_R_stamp := \
        $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp
 $(full_classes_compiled_jar): $(framework_res_R_stamp)
+$(built_dex_intermediate): $(framework_res_R_stamp)
 
 $(framework_module): | $(dir $(framework_module))framework-res.apk
 
@@ -429,6 +450,7 @@ include $(CLEAR_VARS)
 
 aidl_files := \
        frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
+       frameworks/base/telephony/java/android/telephony/SubscriptionInfo.aidl \
        frameworks/base/telephony/java/android/telephony/CellInfo.aidl \
        frameworks/base/telephony/java/android/telephony/SignalStrength.aidl \
        frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
@@ -438,6 +460,7 @@ aidl_files := \
        frameworks/base/location/java/android/location/Criteria.aidl \
        frameworks/base/media/java/android/media/MediaMetadata.aidl \
        frameworks/base/media/java/android/media/MediaDescription.aidl \
+       frameworks/base/media/java/android/media/routing/MediaRouteSelector.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 \
@@ -529,17 +552,23 @@ 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/CarrierIdentifier.aidl \
        frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
        frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
+       frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \
        frameworks/base/core/java/android/speech/tts/Voice.aidl \
        frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
+       frameworks/base/core/java/android/app/AssistStructure.aidl \
+       frameworks/base/core/java/android/app/AssistContent.aidl \
        frameworks/base/core/java/android/app/Notification.aidl \
+       frameworks/base/core/java/android/app/NotificationManager.aidl \
        frameworks/base/core/java/android/app/WallpaperInfo.aidl \
        frameworks/base/core/java/android/app/AppOpsManager.aidl \
        frameworks/base/core/java/android/app/ActivityManager.aidl \
        frameworks/base/core/java/android/app/PendingIntent.aidl \
        frameworks/base/core/java/android/app/AlarmManager.aidl \
        frameworks/base/core/java/android/app/SearchableInfo.aidl \
+       frameworks/base/core/java/android/app/VoiceInteractor.aidl \
        frameworks/base/core/java/android/app/job/JobParameters.aidl \
        frameworks/base/core/java/android/app/job/JobInfo.aidl \
        frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
@@ -585,7 +614,7 @@ aidl_files := \
        frameworks/base/core/java/android/bluetooth/le/ScanFilter.aidl \
        frameworks/base/core/java/android/bluetooth/le/ScanResult.aidl \
        frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \
-       frameworks/base/core/java/android/database/CursorWindow.aidl
+       frameworks/base/core/java/android/database/CursorWindow.aidl \
 
 gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
 $(gen): PRIVATE_SRC_FILES := $(aidl_files)
@@ -600,7 +629,10 @@ $(gen): $(aidl_files) | $(AIDL)
 # TODO: deal with com/google/android/googleapps
 packages_to_document := \
        android \
-       javax/microedition/khronos
+       javax/microedition/khronos \
+       org/apache/http/conn \
+       org/apache/http/params
+
 
 # Search through the base framework dirs for these packages.
 # The result will be relative to frameworks/base.
@@ -621,7 +653,6 @@ include libcore/Docs.mk
 include external/junit/Common.mk
 
 non_base_dirs := \
-       ../../external/apache-http/src/org/apache/http \
        ../opt/telephony/src/java/android/provider \
        ../opt/telephony/src/java/android/telephony \
        ../opt/telephony/src/java/android/telephony/gsm \
@@ -1040,13 +1071,8 @@ include $(BUILD_DROIDDOC)
 # Build ext.jar
 # ============================================================
 
-# NOTICE notes for non-obvious sections
-# apache-http - covered by the Apache Commons section.
-
-
 ext_dirs := \
        ../../external/nist-sip/java \
-       ../../external/apache-http/src \
        ../../external/tagsoup/src \
 
 ext_src_files := $(call all-java-files-under,$(ext_dirs))