diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 826 |
1 files changed, 96 insertions, 730 deletions
diff --git a/Android.mk b/Android.mk index dfcfa2b688e8..7c186b7ad2df 100644 --- a/Android.mk +++ b/Android.mk @@ -15,16 +15,8 @@ # LOCAL_PATH := $(call my-dir) -# We have a special case here where we build the library's resources -# independently from its code, so we need to find where the resource -# class source got placed in the course of building the resources. -# Thus, the magic here. -# Also, this module cannot depend directly on the R.java file; if it -# did, the PRIVATE_* vars for R.java wouldn't be guaranteed to be correct. -# Instead, it depends on the R.stamp file, which lists the corresponding -# R.java file as a prerequisite. -# TODO: find a more appropriate way to do this. -framework_res_source_path := APPS/framework-res_intermediates/src +# Load framework-specific path mappings used later in the build. +include $(LOCAL_PATH)/pathmap.mk # Build the master framework library. # The framework contains too many method references (>64K) for poor old DEX. @@ -35,612 +27,6 @@ framework_res_source_path := APPS/framework-res_intermediates/src # embedded builds use nothing in frameworks/base ifneq ($(ANDROID_BUILD_EMBEDDED),true) -include $(CLEAR_VARS) - -# Load framework-specific path mappings used later in the build. -include $(LOCAL_PATH)/pathmap.mk - -# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk -LOCAL_SRC_FILES := \ - $(call find-other-java-files,$(FRAMEWORKS_BASE_SUBDIRS)) \ - $(call all-proto-files-under, core/proto) - -# EventLogTags files. -LOCAL_SRC_FILES += \ - core/java/android/app/admin/SecurityLogTags.logtags \ - core/java/android/content/EventLogTags.logtags \ - core/java/android/speech/tts/EventLogTags.logtags \ - core/java/android/net/EventLogTags.logtags \ - core/java/android/webkit/EventLogTags.logtags \ - core/java/com/android/internal/logging/EventLogTags.logtags \ - -## READ ME: ######################################################## -## -## When updating this list of aidl files, consider if that aidl is -## part of the SDK API. If it is, also add it to the list below that -## is preprocessed and distributed with the SDK. This list should -## not contain any aidl files for parcelables, but the one below should -## if you intend for 3rd parties to be able to send those objects -## across process boundaries. -## -## READ ME: ######################################################## -LOCAL_SRC_FILES += \ - core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl \ - core/java/android/accessibilityservice/IAccessibilityServiceClient.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/IActivityManager.aidl \ - core/java/android/app/IActivityPendingResult.aidl \ - core/java/android/app/IAlarmCompleteListener.aidl \ - core/java/android/app/IAlarmListener.aidl \ - core/java/android/app/IAlarmManager.aidl \ - core/java/android/app/IAppTask.aidl \ - core/java/android/app/IApplicationThread.aidl \ - core/java/android/app/ITaskStackListener.aidl \ - core/java/android/app/IBackupAgent.aidl \ - core/java/android/app/IEphemeralResolver.aidl \ - core/java/android/app/IInputForwarder.aidl \ - core/java/android/app/IInstantAppResolver.aidl \ - core/java/android/app/IInstrumentationWatcher.aidl \ - core/java/android/app/INotificationManager.aidl \ - core/java/android/app/IProcessObserver.aidl \ - core/java/android/app/ISearchManager.aidl \ - core/java/android/app/ISearchManagerCallback.aidl \ - core/java/android/app/IServiceConnection.aidl \ - core/java/android/app/IStopUserCallback.aidl \ - core/java/android/app/job/IJobCallback.aidl \ - core/java/android/app/job/IJobScheduler.aidl \ - core/java/android/app/job/IJobService.aidl \ - core/java/android/app/ITransientNotification.aidl \ - core/java/android/app/IUidObserver.aidl \ - core/java/android/app/IUiAutomationConnection.aidl \ - core/java/android/app/IUiModeManager.aidl \ - core/java/android/app/IUserSwitchObserver.aidl \ - core/java/android/app/IWallpaperManager.aidl \ - core/java/android/app/IWallpaperManagerCallback.aidl \ - core/java/android/app/admin/IDeviceAdminService.aidl \ - core/java/android/app/admin/IDevicePolicyManager.aidl \ - core/java/android/app/trust/IStrongAuthTracker.aidl \ - core/java/android/app/trust/ITrustManager.aidl \ - core/java/android/app/trust/ITrustListener.aidl \ - core/java/android/app/backup/IBackupManager.aidl \ - core/java/android/app/backup/IBackupObserver.aidl \ - core/java/android/app/backup/IBackupManagerMonitor.aidl \ - core/java/android/app/backup/IFullBackupRestoreObserver.aidl \ - core/java/android/app/backup/IRestoreObserver.aidl \ - core/java/android/app/backup/IRestoreSession.aidl \ - core/java/android/app/backup/ISelectBackupTransportCallback.aidl \ - core/java/android/app/timezone/ICallback.aidl \ - core/java/android/app/timezone/IRulesManager.aidl \ - core/java/android/app/usage/ICacheQuotaService.aidl \ - core/java/android/app/usage/IStorageStatsManager.aidl \ - core/java/android/app/usage/IUsageStatsManager.aidl \ - core/java/android/bluetooth/IBluetooth.aidl \ - core/java/android/bluetooth/IBluetoothA2dp.aidl \ - 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 \ - core/java/android/bluetooth/IBluetoothHealthCallback.aidl \ - core/java/android/bluetooth/IBluetoothInputDevice.aidl \ - core/java/android/bluetooth/IBluetoothPan.aidl \ - core/java/android/bluetooth/IBluetoothManager.aidl \ - core/java/android/bluetooth/IBluetoothManagerCallback.aidl \ - core/java/android/bluetooth/IBluetoothMap.aidl \ - core/java/android/bluetooth/IBluetoothMapClient.aidl \ - core/java/android/bluetooth/IBluetoothPbap.aidl \ - core/java/android/bluetooth/IBluetoothPbapClient.aidl \ - core/java/android/bluetooth/IBluetoothSap.aidl \ - core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \ - core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \ - core/java/android/bluetooth/IBluetoothInputHost.aidl \ - core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ - core/java/android/bluetooth/IBluetoothGatt.aidl \ - core/java/android/bluetooth/IBluetoothGattCallback.aidl \ - core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \ - core/java/android/bluetooth/le/IAdvertisingSetCallback.aidl \ - core/java/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl \ - core/java/android/bluetooth/le/IScannerCallback.aidl \ - core/java/android/content/IClipboard.aidl \ - core/java/android/content/IContentService.aidl \ - core/java/android/content/IIntentReceiver.aidl \ - core/java/android/content/IIntentSender.aidl \ - core/java/android/content/IOnPrimaryClipChangedListener.aidl \ - core/java/android/content/IRestrictionsManager.aidl \ - core/java/android/content/ISyncAdapter.aidl \ - core/java/android/content/ISyncContext.aidl \ - 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 \ - core/java/android/content/pm/IOtaDexopt.aidl \ - core/java/android/content/pm/IPackageDataObserver.aidl \ - core/java/android/content/pm/IPackageDeleteObserver.aidl \ - core/java/android/content/pm/IPackageDeleteObserver2.aidl \ - core/java/android/content/pm/IPackageInstallObserver.aidl \ - core/java/android/content/pm/IPackageInstallObserver2.aidl \ - core/java/android/content/pm/IPackageInstaller.aidl \ - core/java/android/content/pm/IPackageInstallerCallback.aidl \ - core/java/android/content/pm/IPackageInstallerSession.aidl \ - core/java/android/content/pm/IPackageManager.aidl \ - ../native/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl \ - core/java/android/content/pm/IPackageMoveObserver.aidl \ - core/java/android/content/pm/IPackageStatsObserver.aidl \ - core/java/android/content/pm/IPinItemRequest.aidl \ - core/java/android/content/pm/IShortcutService.aidl \ - core/java/android/content/pm/permission/IRuntimePermissionPresenter.aidl \ - core/java/android/database/IContentObserver.aidl \ - ../av/camera/aidl/android/hardware/ICameraService.aidl \ - ../av/camera/aidl/android/hardware/ICameraServiceListener.aidl \ - ../av/camera/aidl/android/hardware/ICameraServiceProxy.aidl \ - ../av/camera/aidl/android/hardware/ICamera.aidl \ - ../av/camera/aidl/android/hardware/ICameraClient.aidl \ - ../av/camera/aidl/android/hardware/camera2/ICameraDeviceUser.aidl \ - ../av/camera/aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl \ - core/java/android/hardware/IConsumerIrService.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/IFingerprintServiceLockoutResetCallback.aidl \ - core/java/android/hardware/fingerprint/IFingerprintClientActiveCallback.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 \ - core/java/android/hardware/hdmi/IHdmiHotplugEventListener.aidl \ - core/java/android/hardware/hdmi/IHdmiInputChangeListener.aidl \ - core/java/android/hardware/hdmi/IHdmiMhlVendorCommandListener.aidl \ - core/java/android/hardware/hdmi/IHdmiRecordListener.aidl \ - core/java/android/hardware/hdmi/IHdmiSystemAudioModeChangeListener.aidl \ - core/java/android/hardware/hdmi/IHdmiVendorCommandListener.aidl \ - core/java/android/hardware/input/IInputManager.aidl \ - core/java/android/hardware/input/IInputDevicesChangedListener.aidl \ - core/java/android/hardware/input/ITabletModeChangedListener.aidl \ - core/java/android/hardware/location/IActivityRecognitionHardware.aidl \ - core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl \ - core/java/android/hardware/location/IActivityRecognitionHardwareSink.aidl \ - core/java/android/hardware/location/IActivityRecognitionHardwareWatcher.aidl \ - core/java/android/hardware/location/IFusedLocationHardware.aidl \ - core/java/android/hardware/location/IFusedLocationHardwareSink.aidl \ - core/java/android/hardware/location/IGeofenceHardware.aidl \ - core/java/android/hardware/location/IGeofenceHardwareCallback.aidl \ - 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 \ - core/java/android/net/IConnectivityManager.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/IIpSecService.aidl \ - core/java/android/net/INetworkManagementEventObserver.aidl \ - core/java/android/net/INetworkPolicyListener.aidl \ - core/java/android/net/INetworkPolicyManager.aidl \ - core/java/android/net/INetworkRecommendationProvider.aidl \ - core/java/android/net/INetworkScoreCache.aidl \ - core/java/android/net/INetworkScoreService.aidl \ - core/java/android/net/INetworkStatsService.aidl \ - core/java/android/net/INetworkStatsSession.aidl \ - core/java/android/net/ITetheringStatsProvider.aidl \ - core/java/android/net/nsd/INsdManager.aidl \ - core/java/android/nfc/IAppCallback.aidl \ - core/java/android/nfc/INfcAdapter.aidl \ - core/java/android/nfc/INfcAdapterExtras.aidl \ - core/java/android/nfc/INfcTag.aidl \ - core/java/android/nfc/INfcCardEmulation.aidl \ - core/java/android/nfc/INfcFCardEmulation.aidl \ - core/java/android/nfc/INfcUnlockHandler.aidl \ - core/java/android/nfc/INfcDta.aidl \ - core/java/android/nfc/ITagRemovedCallback.aidl \ - core/java/android/os/IBatteryPropertiesListener.aidl \ - core/java/android/os/IBatteryPropertiesRegistrar.aidl \ - core/java/android/os/ICancellationSignal.aidl \ - core/java/android/os/IDeviceIdentifiersPolicyService.aidl \ - core/java/android/os/IDeviceIdleController.aidl \ - core/java/android/os/IHardwarePropertiesManager.aidl \ - core/java/android/os/IIncidentManager.aidl \ - core/java/android/os/IIncidentReportCompletedListener.aidl \ - core/java/android/os/IIncidentReportStatusListener.aidl \ - core/java/android/os/IMaintenanceActivityListener.aidl \ - core/java/android/os/IMessenger.aidl \ - core/java/android/os/INetworkActivityListener.aidl \ - core/java/android/os/INetworkManagementService.aidl \ - core/java/android/os/IPermissionController.aidl \ - core/java/android/os/IProcessInfoService.aidl \ - core/java/android/os/IProgressListener.aidl \ - core/java/android/os/IPowerManager.aidl \ - core/java/android/os/IRecoverySystem.aidl \ - core/java/android/os/IRecoverySystemProgressListener.aidl \ - core/java/android/os/IRemoteCallback.aidl \ - core/java/android/os/ISchedulingPolicyService.aidl \ - core/java/android/os/IThermalEventListener.aidl \ - core/java/android/os/IThermalService.aidl \ - core/java/android/os/IUpdateLock.aidl \ - core/java/android/os/IUserManager.aidl \ - core/java/android/os/IVibratorService.aidl \ - core/java/android/os/storage/IStorageManager.aidl \ - core/java/android/os/storage/IStorageEventListener.aidl \ - core/java/android/os/storage/IStorageShutdownObserver.aidl \ - core/java/android/os/storage/IObbActionListener.aidl \ - core/java/android/security/IKeystoreService.aidl \ - core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl \ - core/java/android/service/autofill/IAutoFillService.aidl \ - core/java/android/service/autofill/IFillCallback.aidl \ - core/java/android/service/autofill/ISaveCallback.aidl \ - 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/IRetainSubscriptionsForFactoryResetCallback.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 \ - core/java/android/service/notification/IConditionListener.aidl \ - core/java/android/service/notification/IConditionProvider.aidl \ - core/java/android/service/vr/IPersistentVrStateCallbacks.aidl \ - core/java/android/service/vr/IVrListener.aidl \ - core/java/android/service/vr/IVrManager.aidl \ - core/java/android/service/vr/IVrStateCallbacks.aidl \ - core/java/android/print/ILayoutResultCallback.aidl \ - core/java/android/print/IPrinterDiscoveryObserver.aidl \ - core/java/android/print/IPrintDocumentAdapter.aidl \ - core/java/android/print/IPrintDocumentAdapterObserver.aidl \ - core/java/android/print/IPrintJobStateChangeListener.aidl \ - core/java/android/print/IPrintServicesChangeListener.aidl \ - core/java/android/printservice/recommendation/IRecommendationsChangeListener.aidl \ - core/java/android/print/IPrintManager.aidl \ - core/java/android/print/IPrintSpooler.aidl \ - core/java/android/print/IPrintSpoolerCallbacks.aidl \ - core/java/android/print/IPrintSpoolerClient.aidl \ - core/java/android/printservice/recommendation/IRecommendationServiceCallbacks.aidl \ - core/java/android/printservice/recommendation/IRecommendationService.aidl \ - core/java/android/print/IWriteResultCallback.aidl \ - core/java/android/printservice/IPrintService.aidl \ - core/java/android/printservice/IPrintServiceClient.aidl \ - core/java/android/companion/ICompanionDeviceManager.aidl \ - core/java/android/companion/ICompanionDeviceDiscoveryService.aidl \ - core/java/android/companion/ICompanionDeviceDiscoveryServiceCallback.aidl \ - core/java/android/companion/IFindDeviceCallback.aidl \ - core/java/android/service/dreams/IDreamManager.aidl \ - core/java/android/service/dreams/IDreamService.aidl \ - core/java/android/service/oemlock/IOemLockService.aidl \ - core/java/android/service/persistentdata/IPersistentDataBlockService.aidl \ - core/java/android/service/trust/ITrustAgentService.aidl \ - core/java/android/service/trust/ITrustAgentServiceCallback.aidl \ - core/java/android/service/voice/IVoiceInteractionService.aidl \ - core/java/android/service/voice/IVoiceInteractionSession.aidl \ - core/java/android/service/voice/IVoiceInteractionSessionService.aidl \ - 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/service/resolver/IResolverRankerService.aidl \ - core/java/android/service/resolver/IResolverRankerResult.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/autofill/IAutoFillManager.aidl \ - core/java/android/view/autofill/IAutoFillManagerClient.aidl \ - core/java/android/view/autofill/IAutofillWindowPresenter.aidl \ - core/java/android/view/IApplicationToken.aidl \ - core/java/android/view/IAppTransitionAnimationSpecsFuture.aidl \ - core/java/android/view/IDockedStackListener.aidl \ - core/java/android/view/IGraphicsStats.aidl \ - core/java/android/view/IGraphicsStatsCallback.aidl \ - core/java/android/view/IInputFilter.aidl \ - core/java/android/view/IInputFilterHost.aidl \ - core/java/android/view/IOnKeyguardExitResult.aidl \ - 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 \ - core/java/android/view/IWindowManager.aidl \ - core/java/android/view/IWindowSession.aidl \ - core/java/android/view/IWindowSessionCallback.aidl \ - core/java/android/webkit/IWebViewUpdateService.aidl \ - core/java/android/speech/IRecognitionListener.aidl \ - core/java/android/speech/IRecognitionService.aidl \ - core/java/android/speech/tts/ITextToSpeechCallback.aidl \ - 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/ISoundTriggerService.aidl \ - core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \ - core/java/com/android/internal/app/IVoiceInteractionSessionListener.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 \ - core/java/com/android/internal/app/IMediaContainerService.aidl \ - core/java/com/android/internal/app/procstats/IProcessStats.aidl \ - core/java/com/android/internal/appwidget/IAppWidgetService.aidl \ - 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 \ - 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/policy/IShortcutService.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 \ - core/java/com/android/internal/os/IShellCallback.aidl \ - core/java/com/android/internal/statusbar/IStatusBar.aidl \ - core/java/com/android/internal/statusbar/IStatusBarService.aidl \ - core/java/com/android/internal/textservice/ISpellCheckerService.aidl \ - core/java/com/android/internal/textservice/ISpellCheckerServiceCallback.aidl \ - core/java/com/android/internal/textservice/ISpellCheckerSession.aidl \ - core/java/com/android/internal/textservice/ISpellCheckerSessionListener.aidl \ - core/java/com/android/internal/textservice/ITextServicesManager.aidl \ - core/java/com/android/internal/textservice/ITextServicesSessionListener.aidl \ - core/java/com/android/internal/view/IDragAndDropPermissions.aidl \ - core/java/com/android/internal/view/IInputContext.aidl \ - core/java/com/android/internal/view/IInputContextCallback.aidl \ - core/java/com/android/internal/view/IInputMethod.aidl \ - 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/view/IInputSessionCallback.aidl \ - core/java/com/android/internal/widget/ICheckCredentialProgressCallback.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 \ - keystore/java/android/security/IKeyChainService.aidl \ - location/java/android/location/IBatchedLocationCallback.aidl \ - location/java/android/location/ICountryDetector.aidl \ - location/java/android/location/ICountryListener.aidl \ - location/java/android/location/IFusedProvider.aidl \ - location/java/android/location/IGeocodeProvider.aidl \ - location/java/android/location/IGeofenceProvider.aidl \ - location/java/android/location/IGnssStatusListener.aidl \ - location/java/android/location/IGnssStatusProvider.aidl \ - location/java/android/location/IGnssMeasurementsListener.aidl \ - location/java/android/location/IGnssNavigationMessageListener.aidl \ - location/java/android/location/ILocationListener.aidl \ - location/java/android/location/ILocationManager.aidl \ - location/java/android/location/IFusedGeofenceHardware.aidl \ - location/java/android/location/IGpsGeofenceHardware.aidl \ - location/java/android/location/INetInitiatedListener.aidl \ - location/java/com/android/internal/location/ILocationProvider.aidl \ - media/java/android/media/IAudioService.aidl \ - media/java/android/media/IAudioFocusDispatcher.aidl \ - media/java/android/media/IAudioRoutesObserver.aidl \ - media/java/android/media/IMediaHTTPConnection.aidl \ - media/java/android/media/IMediaHTTPService.aidl \ - media/java/android/media/IMediaResourceMonitor.aidl \ - media/java/android/media/IMediaRouterClient.aidl \ - media/java/android/media/IMediaRouterService.aidl \ - media/java/android/media/IMediaScannerListener.aidl \ - media/java/android/media/IMediaScannerService.aidl \ - media/java/android/media/IPlaybackConfigDispatcher.aidl \ - media/java/android/media/IPlayer.aidl \ - media/java/android/media/IRecordingConfigDispatcher.aidl \ - media/java/android/media/IRemoteDisplayCallback.aidl \ - media/java/android/media/IRemoteDisplayProvider.aidl \ - media/java/android/media/IRemoteVolumeController.aidl \ - 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/midi/IBluetoothMidiService.aidl \ - media/java/android/media/midi/IMidiDeviceListener.aidl \ - media/java/android/media/midi/IMidiDeviceOpenCallback.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/session/IActiveSessionsListener.aidl \ - media/java/android/media/session/ICallback.aidl \ - media/java/android/media/session/IOnMediaKeyListener.aidl \ - media/java/android/media/session/IOnVolumeKeyLongPressListener.aidl \ - media/java/android/media/session/ISession.aidl \ - media/java/android/media/session/ISessionCallback.aidl \ - media/java/android/media/session/ISessionController.aidl \ - media/java/android/media/session/ISessionControllerCallback.aidl \ - media/java/android/media/session/ISessionManager.aidl \ - media/java/android/media/tv/ITvInputClient.aidl \ - media/java/android/media/tv/ITvInputHardware.aidl \ - media/java/android/media/tv/ITvInputHardwareCallback.aidl \ - media/java/android/media/tv/ITvInputManager.aidl \ - media/java/android/media/tv/ITvInputManagerCallback.aidl \ - media/java/android/media/tv/ITvInputService.aidl \ - media/java/android/media/tv/ITvInputServiceCallback.aidl \ - media/java/android/media/tv/ITvInputSession.aidl \ - media/java/android/media/tv/ITvInputSessionCallback.aidl \ - media/java/android/media/tv/ITvRemoteProvider.aidl \ - media/java/android/media/tv/ITvRemoteServiceInput.aidl \ - media/java/android/service/media/IMediaBrowserService.aidl \ - media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl \ - telecomm/java/com/android/internal/telecom/ICallScreeningAdapter.aidl \ - telecomm/java/com/android/internal/telecom/ICallScreeningService.aidl \ - telecomm/java/com/android/internal/telecom/IVideoCallback.aidl \ - telecomm/java/com/android/internal/telecom/IVideoProvider.aidl \ - telecomm/java/com/android/internal/telecom/IConnectionService.aidl \ - telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl \ - telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl \ - telecomm/java/com/android/internal/telecom/IInCallService.aidl \ - telecomm/java/com/android/internal/telecom/ITelecomService.aidl \ - telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \ - telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl \ - telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl \ - telephony/java/android/telephony/mbms/IDownloadStateCallback.aidl \ - telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \ - telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \ - telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \ - telephony/java/com/android/ims/internal/IImsCallSession.aidl \ - telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl \ - telephony/java/com/android/ims/internal/IImsConfig.aidl \ - telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl \ - telephony/java/com/android/ims/internal/IImsEcbm.aidl \ - telephony/java/com/android/ims/internal/IImsEcbmListener.aidl \ - telephony/java/com/android/ims/internal/IImsExternalCallStateListener.aidl \ - telephony/java/com/android/ims/internal/IImsFeatureStatusCallback.aidl \ - telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl \ - telephony/java/com/android/ims/internal/IImsService.aidl \ - telephony/java/com/android/ims/internal/IImsServiceController.aidl \ - telephony/java/com/android/ims/internal/IImsServiceFeatureListener.aidl \ - telephony/java/com/android/ims/internal/IImsStreamMediaSession.aidl \ - telephony/java/com/android/ims/internal/IImsUt.aidl \ - telephony/java/com/android/ims/internal/IImsUtListener.aidl \ - telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl \ - telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl \ - telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl \ - telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl \ - telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl \ - telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl \ - telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl \ - telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl \ - telephony/java/com/android/ims/ImsConfigListener.aidl \ - telephony/java/com/android/internal/telephony/IApnSourceService.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/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 \ - wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl \ - wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ - wifi/java/android/net/wifi/IWifiScanner.aidl \ - wifi/java/android/net/wifi/IRttManager.aidl \ - packages/services/PacProcessor/com/android/net/IProxyService.aidl \ - packages/services/Proxy/com/android/net/IProxyCallback.aidl \ - packages/services/Proxy/com/android/net/IProxyPortListener.aidl \ - core/java/android/service/quicksettings/IQSService.aidl \ - core/java/android/service/quicksettings/IQSTileService.aidl \ - -# The following are native binders that need to go with the native component -# at system/update_engine/binder_bindings/. Use relative path to refer to them. -LOCAL_SRC_FILES += \ - ../../system/update_engine/binder_bindings/android/os/IUpdateEngine.aidl \ - ../../system/update_engine/binder_bindings/android/os/IUpdateEngineCallback.aidl \ - -LOCAL_SRC_FILES += \ - ../../system/netd/server/binder/android/net/INetd.aidl \ - ../native/cmds/installd/binder/android/os/IInstalld.aidl \ - -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) \ - frameworks/native/aidl/binder - -LOCAL_AIDL_INCLUDES += \ - frameworks/av/camera/aidl \ - frameworks/av/drm/libmediadrm/aidl \ - frameworks/native/aidl/gui \ - system/netd/server/binder - -LOCAL_INTERMEDIATE_SOURCES := \ - $(framework_res_source_path)/android/R.java \ - $(framework_res_source_path)/android/Manifest.java \ - $(framework_res_source_path)/com/android/internal/R.java - -# Make sure that R.java and Manifest.java are built before we build -# the source for this library. -framework_res_R_stamp := \ - $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp -LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp) - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext - -LOCAL_STATIC_JAVA_LIBRARIES := \ - framework-protos \ - android.hardware.health-V1.0-java-constants \ - 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 \ - -include hardware/interfaces/cas/1.0/CasHal.mk - -# Loaded with System.loadLibrary by android.view.textclassifier -LOCAL_REQUIRED_MODULES += libtextclassifier - -LOCAL_PROTOC_OPTIMIZE_TYPE := stream -LOCAL_PROTOC_FLAGS := \ - -Iexternal/protobuf/src - -LOCAL_MODULE := framework - -LOCAL_DX_FLAGS := --core-library --multi-dex -LOCAL_JACK_FLAGS := --multi-dex native - -LOCAL_RMTYPEDEFS := true - -ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) -LOCAL_EMMA_INSTRUMENT := true -endif - -include $(BUILD_JAVA_LIBRARY) - -framework_module := $(LOCAL_INSTALLED_MODULE) -$(framework_module): | $(dir $(framework_module))framework-res.apk - -framework_built := $(call java-lib-deps,framework) - # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. # ============================================================ @@ -660,6 +46,8 @@ aidl_files := \ 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/data/DataCallResponse.aidl \ + frameworks/base/telephony/java/android/telephony/data/DataProfile.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 \ @@ -843,16 +231,16 @@ aidl_files := \ frameworks/base/core/java/android/nfc/Tag.aidl \ frameworks/base/core/java/android/nfc/NdefRecord.aidl \ frameworks/base/core/java/android/nfc/NdefMessage.aidl \ - frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ - frameworks/base/core/java/android/bluetooth/le/AdvertiseSettings.aidl \ - frameworks/base/core/java/android/bluetooth/le/ScanSettings.aidl \ - frameworks/base/core/java/android/bluetooth/le/AdvertiseData.aidl \ - 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/service/quicksettings/Tile.aidl \ frameworks/native/aidl/binder/android/os/PersistableBundle.aidl \ + system/bt/binder/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ + system/bt/binder/android/bluetooth/le/AdvertiseSettings.aidl \ + system/bt/binder/android/bluetooth/le/ScanSettings.aidl \ + system/bt/binder/android/bluetooth/le/AdvertiseData.aidl \ + system/bt/binder/android/bluetooth/le/ScanFilter.aidl \ + system/bt/binder/android/bluetooth/le/ScanResult.aidl \ + system/bt/binder/android/bluetooth/BluetoothDevice.aidl \ system/netd/server/binder/android/net/UidRange.aidl \ frameworks/base/telephony/java/android/telephony/PcoData.aidl \ @@ -868,85 +256,78 @@ $(gen): $(aidl_files) | $(AIDL) # TODO: deal with com/google/android/googleapps packages_to_document := \ - android \ - 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. -fwbase_dirs_to_document := \ - legacy-test/src \ - $(patsubst $(LOCAL_PATH)/%,%, \ - $(wildcard \ - $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \ - $(addprefix $(dir)/, $(packages_to_document)) \ - ) \ - ) \ - ) + android \ + javax/microedition/khronos \ + org/apache/http/conn \ + org/apache/http/params \ # include definition of libcore_to_document include libcore/Docs.mk non_base_dirs := \ - ../opt/telephony/src/java/android/telephony \ - ../opt/telephony/src/java/android/telephony/gsm \ - ../opt/net/voip/src/java/android/net/rtp \ - ../opt/net/voip/src/java/android/net/sip + ../opt/telephony/src/java/android/telephony \ + ../opt/telephony/src/java/android/telephony/gsm \ + ../opt/net/voip/src/java/android/net/rtp \ + ../opt/net/voip/src/java/android/net/sip \ framework_base_android_test_mock_src_files := \ - $(call all-java-files-under, test-runner/src/android/test/mock) + $(call all-java-files-under, test-runner/src/android/test/mock) framework_base_android_test_runner_excluding_mock_src_files := \ - $(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src)) - -# These are relative to frameworks/base -dirs_to_check_apis := \ - $(fwbase_dirs_to_document) \ - $(non_base_dirs) - -########################################################### -## Return all directories that have a 'NO_DOCS' file in -## them, appending a '%' to them to form a pattern to -## filter out files under those directories. -## $(1): A list of base directories to look at. -########################################################### -define find-no-docs-pattern -$(addsuffix %, $(dir $(foreach dir, $(1), $(shell cd $(LOCAL_PATH); find $(dir) -name NO_DOCS)))) -endef + $(filter-out $(framework_base_android_test_mock_src_files), $(call all-java-files-under, test-runner/src)) + +# Find all files in specific directories (relative to frameworks/base) +# to document and check apis +files_to_check_apis := \ + $(call find-other-java-files, \ + legacy-test/src \ + $(non_base_dirs) \ + ) + +# Find all files in specific packages that were used to compile +# framework.jar to document and check apis +files_to_check_apis += \ + $(addprefix ../../,\ + $(filter \ + $(foreach dir,$(FRAMEWORKS_BASE_JAVA_SRC_DIRS),\ + $(foreach package,$(packages_to_document),\ + $(dir)/$(package)/%.java)),\ + $(SOONG_FRAMEWORK_SRCS))) + +# Find all generated files that were used to compile framework.jar +files_to_check_apis_generated := \ + $(filter $(OUT_DIR)/%,\ + $(SOONG_FRAMEWORK_SRCS)) # These are relative to frameworks/base # FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk -dirs_to_document := \ - $(dirs_to_check_apis) \ - test-runner/src \ - $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) - -patterns_to_not_document := \ - $(call find-no-docs-pattern, $(dirs_to_document)) +files_to_document := \ + $(files_to_check_apis) \ + $(call find-other-java-files,\ + $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) \ + test-runner/src) # These are relative to frameworks/base html_dirs := \ $(FRAMEWORKS_BASE_SUBDIRS) \ - $(non_base_dirs) + $(non_base_dirs) \ # Common sources for doc check and api check common_src_files := \ $(call find-other-html-files, $(html_dirs)) \ - $(addprefix ../../, $(libcore_to_document)) + $(addprefix ../../, $(libcore_to_document)) \ # These are relative to frameworks/base framework_docs_LOCAL_SRC_FILES := \ - $(filter-out $(patterns_to_not_document), $(call find-other-java-files, $(dirs_to_document))) \ - $(common_src_files) + $(files_to_document) \ + $(common_src_files) \ # These are relative to frameworks/base framework_docs_LOCAL_API_CHECK_SRC_FILES := \ - $(framework_base_android_test_mock_src_files) \ - $(framework_base_android_test_runner_excluding_mock_src_files) \ - $(call all-java-files-under, $(dirs_to_check_apis)) \ - $(common_src_files) + $(framework_base_android_test_mock_src_files) \ + $(framework_base_android_test_runner_excluding_mock_src_files) \ + $(files_to_check_apis) \ + $(common_src_files) \ # This is used by ide.mk as the list of source files that are # always included. @@ -955,10 +336,11 @@ INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document)) framework_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) -framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ - $(framework_res_source_path)/android/R.java \ - $(framework_res_source_path)/android/Manifest.java \ - $(framework_res_source_path)/com/android/internal/R.java +framework_docs_LOCAL_SRCJARS := $(SOONG_FRAMEWORK_SRCJARS) + +framework_docs_LOCAL_GENERATED_SOURCES := \ + $(libcore_to_document_generated) \ + $(files_to_check_apis_generated) \ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ core-oj \ @@ -990,7 +372,9 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -knowntags ./frameworks/base/docs/knowntags.txt \ -knowntags ./libcore/known_oj_tags.txt \ -manifest ./frameworks/base/core/res/AndroidManifest.xml \ + -hidePackage com.android.okhttp \ -hidePackage com.android.org.conscrypt \ + -hidePackage com.android.server \ -since $(SRC_API_DIR)/1.xml 1 \ -since $(SRC_API_DIR)/2.xml 2 \ -since $(SRC_API_DIR)/3.xml 3 \ @@ -1018,7 +402,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since $(SRC_API_DIR)/25.txt 25 \ -since $(SRC_API_DIR)/26.txt 26 \ -since $(SRC_API_DIR)/27.txt 27 \ - -werror -lerror -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128 \ + -werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \ -overview $(LOCAL_PATH)/core/java/overview.html \ framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \ @@ -1029,7 +413,7 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ frameworks/base/docs/knowntags.txt \ - libcore/Docs.mk + $(libcore_to_document_generated) samples_dir := development/samples/browseable @@ -1077,7 +461,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1103,7 +488,7 @@ 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) +$(full_target): $(gen) $(INTERNAL_PLATFORM_API_FILE): $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) @@ -1111,7 +496,8 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE)) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1139,7 +525,7 @@ 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) +$(full_target): $(gen) $(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE)) @@ -1147,7 +533,8 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE)) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1176,7 +563,7 @@ 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) +$(full_target): $(gen) $(INTERNAL_PLATFORM_TEST_API_FILE): $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE)) @@ -1184,7 +571,8 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE)) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1206,7 +594,7 @@ 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) +$(full_target): $(gen) # Run this for checkbuild checkbuild: doc-comment-check-docs @@ -1217,7 +605,8 @@ update-api: doc-comment-check-docs include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1246,14 +635,14 @@ $(static_doc_index_redirect): \ $(hide) $(ACP) $< $@ $(full_target): $(static_doc_index_redirect) -$(full_target): $(framework_built) # ==== static html in the sdk ================================== include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1288,14 +677,14 @@ $(static_doc_properties): \ $(full_target): $(static_doc_index_redirect) $(full_target): $(static_doc_properties) -$(full_target): $(framework_built) # ==== docs for the web (on the androiddevdocs app engine server) ======================= include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) @@ -1323,7 +712,8 @@ include $(BUILD_DROIDDOC) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) @@ -1358,7 +748,8 @@ include $(BUILD_DROIDDOC) # ==== docs for the web (on the devsite app engine server) ======================= include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) @@ -1387,7 +778,8 @@ include $(BUILD_DROIDDOC) # ==== docs for the web (on the devsite app engine server) ======================= include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) @@ -1416,7 +808,8 @@ include $(BUILD_DROIDDOC) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) @@ -1441,7 +834,8 @@ include $(BUILD_DROIDDOC) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) @@ -1469,7 +863,8 @@ include $(BUILD_DROIDDOC) include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) -LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_GENERATED_SOURCES:=$(framework_docs_LOCAL_GENERATED_SOURCES) +LOCAL_SRCJARS:=$(framework_docs_LOCAL_SRCJARS) LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) @@ -1488,35 +883,6 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk include $(BUILD_DROIDDOC) -# Build ext.jar -# ============================================================ - -ext_dirs := \ - ../../external/nist-sip/java \ - ../../external/tagsoup/src \ - -ext_src_files := $(call all-java-files-under,$(ext_dirs)) - -# ==== the library ========================================= -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(ext_src_files) - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := ext - -LOCAL_DX_FLAGS := --core-library - -ifneq ($(INCREMENTAL_BUILDS),) - LOCAL_PROGUARD_ENABLED := disabled - LOCAL_JACK_ENABLED := incremental -endif - -include $(BUILD_JAVA_LIBRARY) - # ==== java proto host library ============================== include $(CLEAR_VARS) LOCAL_MODULE := platformprotos |