From 90625f10f8ad4716d59b3d0aa9a6eef62265dac1 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 7 Aug 2019 22:45:07 +0900 Subject: [PATCH] glob pattern is used for AIDL files under frameworks/base This change removes the manullay curated list of AIDL files and replace them with globs. In addition, framework-aidl-mappings no longer sets frameworks-defaults to its src property, but instead uses the several variables like framework_srcs, framework_aidl_local_include_dirs, etc. to get the same files/dirs list as the framework. The variables will eventually be replaced with filegroups when aidl include paths are better handled (i.e. 'path' property of all filegroups for a module contributes to the AIDL include paths for all AIDL files in the module). Bug: 70046217 Test: m Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b (cherry picked from commit 1cc9566ee26ff2e4ef9d738062409e868a21e34f) Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b --- Android.bp | 735 +++++++----------------------------------------- location/lib/Android.bp | 6 +- 2 files changed, 113 insertions(+), 628 deletions(-) diff --git a/Android.bp b/Android.bp index 2896f28f5e43..dd12b0a39ab7 100644 --- a/Android.bp +++ b/Android.bp @@ -48,637 +48,118 @@ filegroup { ], } +// TODO(b/70046217): make these as filegroups where the base directory for aidl files +// is given as 'path'. Eliminate the need for aidl_local_include_dirs. +framework_srcs = [ + // java sources under this directory + "core/java/**/*.java", + "drm/java/**/*.java", + "graphics/java/**/*.java", + "keystore/java/**/*.java", + "location/java/**/*.java", + "lowpan/java/**/*.java", + "media/java/**/*.java", + "media/mca/effect/java/**/*.java", + "media/mca/filterfw/java/**/*.java", + "media/mca/filterpacks/java/**/*.java", + "opengl/java/**/*.java", + "rs/java/**/*.java", + "sax/java/**/*.java", + "telecomm/java/**/*.java", + "telephony/java/**/*.java", + "wifi/java/**/*.java", + + // aidl under this directory + // b/70046217#comment15 These MUST come after all java srcs. + // TODO(b/70046217) remove the above requirement + "core/java/**/*.aidl", + "graphics/java/**/*.aidl", + "keystore/java/**/*.aidl", + "location/java/**/*.aidl", + "lowpan/java/**/*.aidl", + "media/java/**/*.aidl", + "packages/services/PacProcessor/**/*.aidl", + "packages/services/Proxy/**/*.aidl", + "telecomm/java/**/*.aidl", + "telephony/java/**/*.aidl", + "wifi/java/**/*.aidl", + + // aidl from external directories + ":dumpstate_aidl", + ":gatekeeper_aidl", + ":gsiservice_aidl", + ":incidentcompanion_aidl", + ":installd_aidl", + ":keystore_aidl", + ":libaudioclient_aidl", + ":libbinder_aidl", + ":libbluetooth-binder-aidl", + ":libcamera_client_aidl", + ":libcamera_client_framework_aidl", + ":libupdate_engine_aidl", + ":storaged_aidl", + ":vold_aidl", + + // etc. + "core/java/**/*.logtags", + ":framework-javastream-protos", + ":framework-statslog-gen", + ":platform-properties", +] + +framework_aidl_local_include_dirs = [ + "core/java", + "drm/java", + "graphics/java", + "keystore/java", + "location/java", + "lowpan/java", + "media/java", + "media/mca/effect/java", + "media/mca/filterfw/java", + "media/mca/filterpacks/java", + "opengl/java", + "rs/java", + "sax/java", + "telecomm/java", + "telephony/java", + "wifi/java", +] + +framework_aidl_external_include_dirs = [ + "frameworks/av/camera/aidl", + "frameworks/av/media/libaudioclient/aidl", + "frameworks/native/aidl/binder", + "frameworks/native/aidl/gui", + "frameworks/native/cmds/dumpstate/binder", + "frameworks/native/libs/incidentcompanion/binder", + "system/bt/binder", + "system/core/gatekeeperd/binder", + "system/core/storaged/binder", + "system/gsid/aidl", + "system/security/keystore/binder", + "system/update_engine/binder_bindings", + "system/vold/binder", +] + +java_defaults { + name: "framework-aidl-export-defaults", + + aidl: { + export_include_dirs: framework_aidl_local_include_dirs, + }, +} + java_defaults { name: "framework-defaults", + defaults: ["framework-aidl-export-defaults"], installable: true, - srcs: [ - ":framework-defaults-java-srcs", - ":framework-javastream-protos", - - "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/IAssistDataReceiver.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/slice/ISliceManager.aidl", - "core/java/android/app/slice/ISliceListener.aidl", - "core/java/android/app/timedetector/ITimeDetectorService.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", - ":libbluetooth-binder-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/ISyncAdapterUnsyncableAccountCallback.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/ICrossProfileApps.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/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", - ":libbinder_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/dex/IArtManager.aidl", - "core/java/android/content/pm/dex/ISnapshotRuntimeProfileCallback.aidl", - "core/java/android/content/pm/permission/IRuntimePermissionPresenter.aidl", - "core/java/android/database/IContentObserver.aidl", - ":libcamera_client_aidl", - ":libcamera_client_framework_aidl", - "core/java/android/hardware/IConsumerIrService.aidl", - "core/java/android/hardware/ISerialManager.aidl", - "core/java/android/hardware/biometrics/IBiometricPromptReceiver.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/IFingerprintClientActiveCallback.aidl", - "core/java/android/hardware/fingerprint/IFingerprintService.aidl", - "core/java/android/hardware/fingerprint/IFingerprintServiceLockoutResetCallback.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/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/IContextHubClient.aidl", - "core/java/android/hardware/location/IContextHubClientCallback.aidl", - "core/java/android/hardware/location/IContextHubService.aidl", - "core/java/android/hardware/location/IContextHubTransactionCallback.aidl", - "core/java/android/hardware/radio/IAnnouncementListener.aidl", - "core/java/android/hardware/radio/ICloseHandle.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/ISocketKeepaliveCallback.aidl", - "core/java/android/net/ITestNetworkManager.aidl", - "core/java/android/net/ITetheringEventCallback.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/se/omapi/ISecureElementService.aidl", - "core/java/android/se/omapi/ISecureElementListener.aidl", - "core/java/android/se/omapi/ISecureElementChannel.aidl", - "core/java/android/se/omapi/ISecureElementReader.aidl", - "core/java/android/se/omapi/ISecureElementSession.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/IDynamicAndroidService.aidl", - "core/java/android/os/IHardwarePropertiesManager.aidl", - ":libincident_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", - ":statsd_aidl", - "core/java/android/os/ISystemUpdateManager.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", - ":keystore_aidl", - "core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl", - "core/java/android/service/autofill/IAutoFillService.aidl", - "core/java/android/service/autofill/IAutofillFieldClassificationService.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/IGetOtaStatusCallback.aidl", - "core/java/android/service/euicc/IOtaStatusChangedCallback.aidl", - "core/java/android/service/euicc/IRetainSubscriptionsForFactoryResetCallback.aidl", - "core/java/android/service/euicc/ISwitchToSubscriptionCallback.aidl", - "core/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl", - ":gatekeeper_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/settings/suggestions/ISuggestionService.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/compat/IPlatformCompat.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/service/textclassifier/ITextClassificationCallback.aidl", - "core/java/android/service/textclassifier/ITextClassifierService.aidl", - "core/java/android/service/textclassifier/ITextLinksCallback.aidl", - "core/java/android/service/textclassifier/ITextSelectionCallback.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/IRemoteAnimationRunner.aidl", - "core/java/android/view/IRecentsAnimationController.aidl", - "core/java/android/view/IRecentsAnimationRunner.aidl", - "core/java/android/view/IRemoteAnimationFinishedCallback.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/IAppOpsActiveCallback.aidl", - "core/java/com/android/internal/app/IAppOpsCallback.aidl", - "core/java/com/android/internal/app/IAppOpsService.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/inputmethod/IInputContentUriToken.aidl", - "core/java/com/android/internal/net/INetworkWatchlistManager.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", - "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/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/IAudioFocusDispatcher.aidl", - "media/java/android/media/IAudioRoutesObserver.aidl", - "media/java/android/media/IAudioService.aidl", - "media/java/android/media/IAudioServerStateDispatcher.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/ISessionTokensListener.aidl", - ":libaudioclient_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/soundtrigger/ISoundTriggerDetectionService.aidl", - "media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.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/ICallRedirectionAdapter.aidl", - "telecomm/java/com/android/internal/telecom/ICallRedirectionService.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/IPhoneAccountSuggestionCallback.aidl", - "telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionService.aidl", - "telecomm/java/com/android/internal/telecom/ITelecomService.aidl", - "telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl", - "telephony/java/android/telephony/data/IDataService.aidl", - "telephony/java/android/telephony/data/IDataServiceCallback.aidl", - "telephony/java/android/telephony/data/IQualifiedNetworksService.aidl", - "telephony/java/android/telephony/data/IQualifiedNetworksServiceCallback.aidl", - "telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl", - "telephony/java/android/telephony/ims/aidl/IImsCapabilityCallback.aidl", - "telephony/java/android/telephony/ims/aidl/IImsConfig.aidl", - "telephony/java/android/telephony/ims/aidl/IImsConfigCallback.aidl", - "telephony/java/android/telephony/ims/aidl/IImsMmTelFeature.aidl", - "telephony/java/android/telephony/ims/aidl/IImsMmTelListener.aidl", - "telephony/java/android/telephony/ims/aidl/IImsRegistration.aidl", - "telephony/java/android/telephony/ims/aidl/IImsRegistrationCallback.aidl", - "telephony/java/android/telephony/ims/aidl/IImsRcsFeature.aidl", - "telephony/java/android/telephony/ims/aidl/IImsServiceController.aidl", - "telephony/java/android/telephony/ims/aidl/IImsServiceControllerListener.aidl", - "telephony/java/android/telephony/ims/aidl/IImsSmsListener.aidl", - "telephony/java/android/telephony/ims/aidl/IRcsMessage.aidl", - "telephony/java/android/telephony/ims/aidl/IRcsFeatureListener.aidl", - "telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl", - "telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl", - "telephony/java/android/telephony/mbms/IMbmsGroupCallSessionCallback.aidl", - "telephony/java/android/telephony/mbms/IDownloadStatusListener.aidl", - "telephony/java/android/telephony/mbms/IDownloadProgressListener.aidl", - "telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl", - "telephony/java/android/telephony/mbms/IGroupCallCallback.aidl", - "telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl", - "telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl", - "telephony/java/android/telephony/mbms/vendor/IMbmsGroupCallService.aidl", - "telephony/java/android/telephony/ICellInfoCallback.aidl", - "telephony/java/android/telephony/INetworkService.aidl", - "telephony/java/android/telephony/INetworkServiceCallback.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/IImsMMTelFeature.aidl", - "telephony/java/com/android/ims/internal/IImsMultiEndpoint.aidl", - "telephony/java/com/android/ims/internal/IImsRcsFeature.aidl", - "telephony/java/com/android/ims/internal/IImsService.aidl", - "telephony/java/com/android/ims/internal/IImsServiceController.aidl", - "telephony/java/com/android/ims/internal/IImsServiceFeatureCallback.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/IIntegerConsumer.aidl", - "telephony/java/com/android/internal/telephony/IMms.aidl", - "telephony/java/com/android/internal/telephony/INumberVerificationCallback.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/ISetOpportunisticDataCallback.aidl", - "telephony/java/com/android/internal/telephony/ISms.aidl", - "telephony/java/com/android/internal/telephony/ISub.aidl", - "telephony/java/com/android/internal/telephony/IOns.aidl", - "telephony/java/com/android/internal/telephony/ITelephony.aidl", - "telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl", - "telephony/java/com/android/internal/telephony/IUpdateAvailableNetworksCallback.aidl", - "telephony/java/com/android/internal/telephony/IWapPushManager.aidl", - "telephony/java/com/android/internal/telephony/euicc/IAuthenticateServerCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/ICancelSessionCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IDeleteProfileCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IDisableProfileCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IEuiccCardController.aidl", - "telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetAllProfilesCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetDefaultSmdpAddressCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetEuiccChallengeCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetEuiccInfo1Callback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetEuiccInfo2Callback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetProfileCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetRulesAuthTableCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IGetSmdsAddressCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IListNotificationsCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/ILoadBoundProfilePackageCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IPrepareDownloadCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IRemoveNotificationFromListCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IResetMemoryCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IRetrieveNotificationCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/IRetrieveNotificationListCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/ISetDefaultSmdpAddressCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/ISetNicknameCallback.aidl", - "telephony/java/com/android/internal/telephony/euicc/ISwitchToProfileCallback.aidl", - "wifi/java/android/net/wifi/ISoftApCallback.aidl", - "wifi/java/android/net/wifi/IWifiManager.aidl", - "wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl", - "wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl", - "wifi/java/android/net/wifi/aware/IWifiAwareMacAddressProvider.aidl", - "wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl", - "wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl", - "wifi/java/android/net/wifi/rtt/IRttCallback.aidl", - "wifi/java/android/net/wifi/rtt/IWifiRttManager.aidl", - "wifi/java/android/net/wifi/hotspot2/IProvisioningCallback.aidl", - "wifi/java/android/net/wifi/IWifiScanner.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", - - ":libupdate_engine_aidl", - - ":storaged_aidl", - ":vold_aidl", - ":gsiservice_aidl", - ":installd_aidl", - ":dumpstate_aidl", - - "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", - - "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/os/EventLogTags.logtags", - "core/java/android/webkit/EventLogTags.logtags", - "core/java/com/android/internal/app/EventLogTags.logtags", - "core/java/com/android/internal/logging/EventLogTags.logtags", - "core/java/com/android/server/DropboxLogTags.logtags", - "core/java/org/chromium/arc/EventLogTags.logtags", - - ":platform-properties", - - ":framework-statslog-gen", - ], + srcs: framework_srcs, aidl: { - export_include_dirs: [ - // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS - "core/java", - "graphics/java", - "location/java", - "lowpan/java", - "media/java", - "media/mca/effect/java", - "media/mca/filterfw/java", - "media/mca/filterpacks/java", - "drm/java", - "opengl/java", - "sax/java", - "telecomm/java", - "telephony/java", - "wifi/java", - "keystore/java", - "rs/java", - ], - - include_dirs: [ - "system/update_engine/binder_bindings", - "frameworks/native/aidl/binder", - "frameworks/native/cmds/dumpstate/binder", - "frameworks/av/camera/aidl", - "frameworks/av/media/libaudioclient/aidl", - "frameworks/native/aidl/gui", - "system/core/gatekeeperd/binder", - "system/core/storaged/binder", - "system/vold/binder", - "system/gsid/aidl", - "system/bt/binder", - "system/security/keystore/binder", - ], - + local_include_dirs: framework_aidl_local_include_dirs, + include_dirs: framework_aidl_external_include_dirs, generate_get_transaction_name: true, }, @@ -1731,7 +1212,9 @@ filegroup { // annotations to private apis aidl_mapping { name: "framework-aidl-mappings", - srcs: [":framework-defaults"], + srcs: framework_srcs, + local_include_dirs: framework_aidl_local_include_dirs, + include_dirs: framework_aidl_external_include_dirs, output: "framework-aidl-mappings.txt", } diff --git a/location/lib/Android.bp b/location/lib/Android.bp index 35f287737d17..59963dea0ab9 100644 --- a/location/lib/Android.bp +++ b/location/lib/Android.bp @@ -19,6 +19,8 @@ java_sdk_library { srcs: ["java/**/*.java"], api_packages: ["com.android.location.provider"], srcs_lib: "framework", - srcs_lib_whitelist_dirs: ["location/java"], - srcs_lib_whitelist_pkgs: ["com.android.internal.location"], + // TODO(b/70046217): remove core/java and android below. It was added to provide definitions for + // types like android.os.Bundle + srcs_lib_whitelist_dirs: ["core/java", "location/java"], + srcs_lib_whitelist_pkgs: ["android", "com.android.internal.location"], } -- 2.11.0