OSDN Git Service

RESTRICT AUTOMERGE
[android-x86/frameworks-base.git] / Android.mk
index 730eeb1..25d8fc6 100644 (file)
 #
 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,771 +27,101 @@ framework_res_source_path := APPS/framework-res_intermediates/src
 # embedded builds use nothing in frameworks/base
 ifneq ($(ANDROID_BUILD_EMBEDDED),true)
 
-include $(CLEAR_VARS)
-
-# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
-LOCAL_SRC_FILES := $(call find-other-java-files,$(FRAMEWORKS_BASE_SUBDIRS))
-
-# 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/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/IActivityContainer.aidl \
-       core/java/android/app/IActivityContainerCallback.aidl \
-       core/java/android/app/IActivityController.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/ITaskStackListener.aidl \
-       core/java/android/app/IBackupAgent.aidl \
-       core/java/android/app/IEphemeralResolver.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/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/IFullBackupRestoreObserver.aidl \
-       core/java/android/app/backup/IRestoreObserver.aidl \
-       core/java/android/app/backup/IRestoreSession.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/IBluetoothPbap.aidl \
-       core/java/android/bluetooth/IBluetoothPbapClient.aidl \
-       core/java/android/bluetooth/IBluetoothMap.aidl \
-       core/java/android/bluetooth/IBluetoothSap.aidl \
-       core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
-       core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \
-       core/java/android/bluetooth/IBluetoothGatt.aidl \
-       core/java/android/bluetooth/IBluetoothGattCallback.aidl \
-       core/java/android/bluetooth/IBluetoothGattServerCallback.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/pm/ILauncherApps.aidl \
-       core/java/android/content/pm/IOnAppsChangedListener.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 \
-       core/java/android/content/pm/IPackageMoveObserver.aidl \
-       core/java/android/content/pm/IPackageStatsObserver.aidl \
-       core/java/android/content/pm/IOnPermissionsChangeListener.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/IFingerprintDaemon.aidl \
-       core/java/android/hardware/fingerprint/IFingerprintDaemonCallback.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/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/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/IConnectivityMetricsLogger.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/INetworkManagementEventObserver.aidl \
-       core/java/android/net/INetworkPolicyListener.aidl \
-       core/java/android/net/INetworkPolicyManager.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/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/ITagRemovedCallback.aidl \
-       core/java/android/os/IBatteryPropertiesListener.aidl \
-       core/java/android/os/IBatteryPropertiesRegistrar.aidl \
-       core/java/android/os/ICancellationSignal.aidl \
-       core/java/android/os/IDeviceIdleController.aidl \
-       core/java/android/os/IHardwarePropertiesManager.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/IUpdateLock.aidl \
-       core/java/android/os/IUserManager.aidl \
-       core/java/android/os/IVibratorService.aidl \
-       core/java/android/security/IKeystoreService.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/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/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/service/dreams/IDreamManager.aidl \
-       core/java/android/service/dreams/IDreamService.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/view/accessibility/IAccessibilityInteractionConnection.aidl\
-       core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl\
-       core/java/android/view/accessibility/IAccessibilityManager.aidl \
-       core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
-       core/java/android/view/IApplicationToken.aidl \
-       core/java/android/view/IAppTransitionAnimationSpecsFuture.aidl \
-       core/java/android/view/IAssetAtlas.aidl \
-       core/java/android/view/IDockedStackListener.aidl \
-       core/java/android/view/IGraphicsStats.aidl \
-       core/java/android/view/IInputFilter.aidl \
-       core/java/android/view/IInputFilterHost.aidl \
-       core/java/android/view/IOnKeyguardExitResult.aidl \
-       core/java/android/view/IRotationWatcher.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/inputmethod/IInputContentUriToken.aidl \
-       core/java/com/android/internal/policy/IKeyguardDrawnCallback.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/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/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/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/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/ISessionController.aidl \
-       media/java/android/media/session/ISessionControllerCallback.aidl \
-       media/java/android/media/session/ISession.aidl \
-       media/java/android/media/session/ISessionCallback.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/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/IImsMultiEndpoint.aidl \
-       telephony/java/com/android/ims/internal/IImsService.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/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 \
-       wifi/java/android/net/wifi/IWifiManager.aidl \
-       wifi/java/android/net/wifi/nan/IWifiNanEventListener.aidl \
-       wifi/java/android/net/wifi/nan/IWifiNanManager.aidl \
-       wifi/java/android/net/wifi/nan/IWifiNanSessionListener.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 \
-
-LOCAL_AIDL_INCLUDES += system/update_engine/binder_bindings
-
-# 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/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
-
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-oj core-libart core-lambda-stubs conscrypt okhttp core-junit bouncycastle ext
-LOCAL_STATIC_JAVA_LIBRARIES := framework-protos
-
-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)
-
-# 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
-$(full_classes_compiled_jar): $(framework_res_R_stamp)
-$(built_dex_intermediate): $(framework_res_R_stamp)
-
-$(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.
 # ============================================================
 include $(CLEAR_VARS)
 
-aidl_files := \
-       frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
-       frameworks/base/telephony/java/android/telephony/SubscriptionInfo.aidl \
-       frameworks/base/telephony/java/android/telephony/CellInfo.aidl \
-       frameworks/base/telephony/java/android/telephony/SignalStrength.aidl \
-       frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
-       frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
-       frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \
-       frameworks/base/location/java/android/location/Location.aidl \
-       frameworks/base/location/java/android/location/Address.aidl \
-       frameworks/base/location/java/android/location/Criteria.aidl \
-       frameworks/base/media/java/android/media/MediaMetadata.aidl \
-       frameworks/base/media/java/android/media/MediaDescription.aidl \
-       frameworks/base/media/java/android/media/Rating.aidl \
-       frameworks/base/media/java/android/media/AudioAttributes.aidl \
-       frameworks/base/media/java/android/media/AudioFocusInfo.aidl \
-       frameworks/base/media/java/android/media/session/PlaybackState.aidl \
-       frameworks/base/media/java/android/media/session/MediaSession.aidl \
-       frameworks/base/media/java/android/media/tv/TvInputInfo.aidl \
-       frameworks/base/media/java/android/media/tv/TvTrackInfo.aidl \
-       frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \
-       frameworks/base/wifi/java/android/net/wifi/ScanSettings.aidl \
-       frameworks/base/wifi/java/android/net/wifi/nan/ConfigRequest.aidl \
-       frameworks/base/wifi/java/android/net/wifi/nan/PublishData.aidl \
-       frameworks/base/wifi/java/android/net/wifi/nan/SubscribeData.aidl \
-       frameworks/base/wifi/java/android/net/wifi/nan/PublishSettings.aidl \
-       frameworks/base/wifi/java/android/net/wifi/nan/SubscribeSettings.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDevice.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pGroup.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl \
-       frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \
-       frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \
-       frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \
-       frameworks/base/wifi/java/android/net/wifi/PasspointManagementObjectDefinition.aidl \
-       frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl \
-       frameworks/base/wifi/java/android/net/wifi/WifiConfiguration.aidl \
-       frameworks/base/wifi/java/android/net/wifi/WifiInfo.aidl \
-       frameworks/base/graphics/java/android/graphics/Region.aidl \
-       frameworks/base/graphics/java/android/graphics/Bitmap.aidl \
-       frameworks/base/graphics/java/android/graphics/Point.aidl \
-       frameworks/base/graphics/java/android/graphics/PointF.aidl \
-       frameworks/base/graphics/java/android/graphics/RectF.aidl \
-       frameworks/base/graphics/java/android/graphics/Rect.aidl \
-       frameworks/base/graphics/java/android/graphics/drawable/Icon.aidl \
-       frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \
-       frameworks/base/core/java/android/accounts/Account.aidl \
-       frameworks/base/core/java/android/app/admin/ConnectEvent.aidl \
-       frameworks/base/core/java/android/app/admin/DnsEvent.aidl \
-       frameworks/base/core/java/android/app/admin/NetworkEvent.aidl \
-       frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \
-       frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \
-       frameworks/base/core/java/android/print/PageRange.aidl \
-       frameworks/base/core/java/android/print/PrintAttributes.aidl \
-       frameworks/base/core/java/android/print/PrinterCapabilitiesInfo.aidl \
-       frameworks/base/core/java/android/print/PrinterId.aidl \
-       frameworks/base/core/java/android/print/PrintJobInfo.aidl \
-       frameworks/base/core/java/android/print/PrinterInfo.aidl \
-       frameworks/base/core/java/android/print/PrintJobId.aidl \
-       frameworks/base/core/java/android/printservice/recommendation/RecommendationInfo.aidl \
-       frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \
-       frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \
-       frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \
-       frameworks/base/core/java/android/hardware/usb/UsbAccessory.aidl \
-       frameworks/base/core/java/android/os/Messenger.aidl \
-       frameworks/base/core/java/android/os/PatternMatcher.aidl \
-       frameworks/base/core/java/android/os/Message.aidl \
-       frameworks/base/core/java/android/os/UserHandle.aidl \
-       frameworks/base/core/java/android/os/ParcelUuid.aidl \
-       frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
-       frameworks/base/core/java/android/os/ResultReceiver.aidl \
-       frameworks/base/core/java/android/os/WorkSource.aidl \
-       frameworks/base/core/java/android/os/DropBoxManager.aidl \
-       frameworks/base/core/java/android/os/Bundle.aidl \
-       frameworks/base/core/java/android/accessibilityservice/AccessibilityServiceInfo.aidl \
-       frameworks/base/core/java/android/net/Network.aidl \
-       frameworks/base/core/java/android/net/RouteInfo.aidl \
-       frameworks/base/core/java/android/net/NetworkInfo.aidl \
-       frameworks/base/core/java/android/net/IpPrefix.aidl \
-       frameworks/base/core/java/android/net/NetworkCapabilities.aidl \
-       frameworks/base/core/java/android/net/DhcpInfo.aidl \
-       frameworks/base/core/java/android/net/ProxyInfo.aidl \
-       frameworks/base/core/java/android/net/LinkProperties.aidl \
-       frameworks/base/core/java/android/net/Uri.aidl \
-       frameworks/base/core/java/android/net/NetworkRequest.aidl \
-       frameworks/base/core/java/android/net/LinkAddress.aidl \
-       frameworks/base/core/java/android/util/MemoryIntArray.aidl \
-       frameworks/base/core/java/android/view/Display.aidl \
-       frameworks/base/core/java/android/view/InputDevice.aidl \
-       frameworks/base/core/java/android/view/InputEvent.aidl \
-       frameworks/native/aidl/gui/android/view/Surface.aidl \
-       frameworks/base/core/java/android/view/WindowContentFrameStats.aidl \
-       frameworks/base/core/java/android/view/inputmethod/InputMethodSubtype.aidl \
-       frameworks/base/core/java/android/view/inputmethod/CursorAnchorInfo.aidl \
-       frameworks/base/core/java/android/view/inputmethod/CompletionInfo.aidl \
-       frameworks/base/core/java/android/view/inputmethod/ExtractedText.aidl \
-       frameworks/base/core/java/android/view/inputmethod/EditorInfo.aidl \
-       frameworks/base/core/java/android/view/inputmethod/InputMethodInfo.aidl \
-       frameworks/base/core/java/android/view/inputmethod/CorrectionInfo.aidl \
-       frameworks/base/core/java/android/view/inputmethod/InputBinding.aidl \
-       frameworks/base/core/java/android/view/inputmethod/ExtractedTextRequest.aidl \
-       frameworks/base/core/java/android/view/DragEvent.aidl \
-       frameworks/base/core/java/android/view/KeyEvent.aidl \
-       frameworks/base/core/java/android/view/WindowManager.aidl \
-       frameworks/base/core/java/android/view/WindowAnimationFrameStats.aidl \
-       frameworks/base/core/java/android/view/MotionEvent.aidl \
-       frameworks/base/core/java/android/view/accessibility/AccessibilityNodeInfo.aidl \
-       frameworks/base/core/java/android/view/accessibility/AccessibilityRecord.aidl \
-       frameworks/base/core/java/android/view/accessibility/AccessibilityWindowInfo.aidl \
-       frameworks/base/core/java/android/view/accessibility/AccessibilityEvent.aidl \
-       frameworks/base/core/java/android/view/textservice/SpellCheckerSubtype.aidl \
-       frameworks/base/core/java/android/view/textservice/TextInfo.aidl \
-       frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \
-       frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \
-       frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
-       frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \
-       frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
-       frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
-       frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \
-       frameworks/base/core/java/android/speech/tts/Voice.aidl \
-       frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
-       frameworks/base/core/java/android/app/Notification.aidl \
-       frameworks/base/core/java/android/app/NotificationManager.aidl \
-       frameworks/base/core/java/android/app/WallpaperInfo.aidl \
-       frameworks/base/core/java/android/app/AppOpsManager.aidl \
-       frameworks/base/core/java/android/app/ActivityManager.aidl \
-       frameworks/base/core/java/android/app/PendingIntent.aidl \
-       frameworks/base/core/java/android/app/AlarmManager.aidl \
-       frameworks/base/core/java/android/app/SearchableInfo.aidl \
-       frameworks/base/core/java/android/app/VoiceInteractor.aidl \
-       frameworks/base/core/java/android/app/assist/AssistContent.aidl \
-       frameworks/base/core/java/android/app/assist/AssistStructure.aidl \
-       frameworks/base/core/java/android/app/job/JobParameters.aidl \
-       frameworks/base/core/java/android/app/job/JobInfo.aidl \
-       frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
-       frameworks/base/core/java/android/content/ClipDescription.aidl \
-       frameworks/base/core/java/android/content/IntentFilter.aidl \
-       frameworks/base/core/java/android/content/Intent.aidl \
-       frameworks/base/core/java/android/content/res/Configuration.aidl \
-       frameworks/base/core/java/android/content/res/ObbInfo.aidl \
-       frameworks/base/core/java/android/content/RestrictionEntry.aidl \
-       frameworks/base/core/java/android/content/ClipData.aidl \
-       frameworks/base/core/java/android/content/SyncAdapterType.aidl \
-       frameworks/base/core/java/android/content/SyncRequest.aidl \
-       frameworks/base/core/java/android/content/PeriodicSync.aidl \
-       frameworks/base/core/java/android/content/SyncResult.aidl \
-       frameworks/base/core/java/android/content/pm/FeatureInfo.aidl \
-       frameworks/base/core/java/android/content/pm/InstrumentationInfo.aidl \
-       frameworks/base/core/java/android/content/pm/PackageInstaller.aidl \
-       frameworks/base/core/java/android/content/pm/ServiceInfo.aidl \
-       frameworks/base/core/java/android/content/pm/Signature.aidl \
-       frameworks/base/core/java/android/content/pm/ApplicationInfo.aidl \
-       frameworks/base/core/java/android/content/pm/PermissionInfo.aidl \
-       frameworks/base/core/java/android/content/pm/ActivityInfo.aidl \
-       frameworks/base/core/java/android/content/pm/PackageInfo.aidl \
-       frameworks/base/core/java/android/content/pm/ResolveInfo.aidl \
-       frameworks/base/core/java/android/content/pm/ProviderInfo.aidl \
-       frameworks/base/core/java/android/content/pm/PackageStats.aidl \
-       frameworks/base/core/java/android/content/pm/PermissionGroupInfo.aidl \
-       frameworks/base/core/java/android/content/pm/ShortcutInfo.aidl \
-       frameworks/base/core/java/android/content/pm/LabeledIntent.aidl \
-       frameworks/base/core/java/android/content/ComponentName.aidl \
-       frameworks/base/core/java/android/content/SyncStats.aidl \
-       frameworks/base/core/java/android/content/ContentValues.aidl \
-       frameworks/base/core/java/android/content/SyncInfo.aidl \
-       frameworks/base/core/java/android/content/IntentSender.aidl \
-       frameworks/base/core/java/android/widget/RemoteViews.aidl \
-       frameworks/base/core/java/android/text/style/SuggestionSpan.aidl \
-       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/netd/server/binder/android/net/UidRange.aidl \
-       frameworks/base/telephony/java/android/telephony/PcoData.aidl \
+aidl_parcelables :=
+define stubs-to-aidl-parcelables
+  gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/$1.aidl
+  aidl_parcelables += $$(gen)
+  $$(gen): $(call java-lib-header-files,$1) $(HOST_OUT_EXECUTABLES)/sdkparcelables
+       @echo Extract SDK parcelables: $$@
+       rm -f $$@
+       $(HOST_OUT_EXECUTABLES)/sdkparcelables $$< $$@
+endef
+
+$(foreach stubs,android_stubs_current android_test_stubs_current android_system_stubs_current,\
+  $(eval $(call stubs-to-aidl-parcelables,$(stubs))))
 
 gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
-$(gen): PRIVATE_SRC_FILES := $(aidl_files)
-ALL_SDK_FILES += $(gen)
-$(gen): $(aidl_files) | $(AIDL)
-               @echo Aidl Preprocess: $@
-               $(hide) $(AIDL) --preprocess $@ $(PRIVATE_SRC_FILES)
+.KATI_RESTAT: $(gen)
+$(gen): $(aidl_parcelables)
+       @echo Combining SDK parcelables: $@
+       rm -f $@.tmp
+       cat $^ | sort -u > $@.tmp
+       $(call commit-change-for-toc,$@)
 
 # the documentation
 # ============================================================
 
 # 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 := \
-       test-runner/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
 
-# include definition of junit_to_document
-include external/junit/Common.mk
-
 non_base_dirs := \
-       ../opt/telephony/src/java/android/provider \
-       ../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
-
-# 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
+  ../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 \
+
+# Find all files in specific directories (relative to frameworks/base)
+# to document and check apis
+files_to_check_apis := \
+  $(call find-other-java-files, \
+    $(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) \
-  $(addprefix ../../, $(FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS)) \
-  $(addprefix ../../, $(FRAMEWORKS_SUPPORT_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,\
+    test-base/src \
+    test-mock/src \
+    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 ../../external/junit/, $(junit_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 := \
-       $(call find-other-java-files, $(dirs_to_check_apis)) \
-       $(common_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.
@@ -808,10 +130,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 \
@@ -820,11 +143,11 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
        bouncycastle \
        okhttp \
        ext \
-       icu4j \
        framework \
-       telephony-common \
-       voip-common
+       voip-common \
 
+# Platform docs can refer to Support Library APIs, but we don't actually build
+# them as part of the docs target, so we need to include them on the classpath.
 framework_docs_LOCAL_JAVA_LIBRARIES := \
        $(framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES) \
        $(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES)
@@ -837,9 +160,15 @@ framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
 # Conscrypt (com.android.org.conscrypt) is an implementation detail and should
 # not be referenced in the documentation.
 framework_docs_LOCAL_DROIDDOC_OPTIONS := \
+    -android \
     -knowntags ./frameworks/base/docs/knowntags.txt \
     -knowntags ./libcore/known_oj_tags.txt \
+    -manifest ./frameworks/base/core/res/AndroidManifest.xml \
+    -hidePackage com.android.internal \
+    -hidePackage com.android.internal.util \
+    -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 \
@@ -865,20 +194,21 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
     -since $(SRC_API_DIR)/23.txt 23 \
     -since $(SRC_API_DIR)/24.txt 24 \
     -since $(SRC_API_DIR)/25.txt 25 \
-               -werror -hide 111 -hide 113 \
-               -overview $(LOCAL_PATH)/core/java/overview.html
+    -since $(SRC_API_DIR)/26.txt 26 \
+    -since $(SRC_API_DIR)/27.txt 27 \
+    -since $(SRC_API_DIR)/28.txt 28 \
+    -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:= \
        $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)
 
 framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \
-       $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) \
-       $(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)) \
-       $(foreach lib,$(FRAMEWORKS_SUPPORT_JAVA_LIBRARIES),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib)-res,,COMMON))
+       $(framework_docs_LOCAL_API_CHECK_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
 
@@ -908,17 +238,100 @@ framework_docs_SDK_VERSION:=7.0
 framework_docs_SDK_REL_ID:=1
 
 framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-               -hdf sdk.codename N \
-               -hdf sdk.preview.version 5 \
+               -hdf dac true \
+               -hdf sdk.codename O \
+               -hdf sdk.preview.version 1 \
                -hdf sdk.version $(framework_docs_SDK_VERSION) \
                -hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
-               -hdf sdk.preview 0
+               -hdf sdk.preview 0 \
+               -resourcesdir $(LOCAL_PATH)/docs/html/reference/images/ \
+               -resourcesoutdir reference/android/images/
+
+# Federate Support Library references against local API file.
+framework_docs_LOCAL_DROIDDOC_OPTIONS += \
+               -federate SupportLib https://developer.android.com \
+               -federationapi SupportLib prebuilts/sdk/current/support-api.txt
+
+# Federate AndroidX references against local API file.
+framework_docs_LOCAL_DROIDDOC_OPTIONS += \
+               -federate AndroidX https://developer.android.com \
+               -federationapi AndroidX prebuilts/sdk/current/androidx-api.txt
+
+framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS := \
+    --manifest ./frameworks/base/core/res/AndroidManifest.xml \
+    --hide-package com.android.okhttp \
+    --hide-package com.android.org.conscrypt --hide-package com.android.server \
+    --hide RequiresPermission \
+    --hide MissingPermission --hide BroadcastBehavior \
+    --hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol \
+    --hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo
+
+# ====  Public API diff ===========================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+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_ADDITIONAL_JAVA_DIR := $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) \
+       $(INTERNAL_PLATFORM_API_FILE)
+
+LOCAL_MODULE := offline-sdk-referenceonly
+
+last_released_sdk_version := $(lastword $(call numerically_sort, \
+                       $(filter-out current, \
+                               $(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \
+                        )\
+               ))
+
+LOCAL_APIDIFF_OLDAPI := $(LOCAL_PATH)/../../$(SRC_API_DIR)/$(last_released_sdk_version)
+LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_API_FILE))
+
+include $(BUILD_APIDIFF)
+
+# Hack to get diffs included in docs output
+out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
+$(out_zip): $(full_target)
+
+# ====  System API diff ===========================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+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_ADDITIONAL_JAVA_DIR := $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+       $(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) \
+       $(INTERNAL_PLATFORM_SYSTEM_API_FILE)
+
+LOCAL_MODULE := offline-system-sdk-referenceonly
+
+last_released_sdk_version := $(lastword $(call numerically_sort, \
+                       $(filter-out current, \
+                               $(patsubst $(SRC_SYSTEM_API_DIR)/%.txt,%, $(wildcard $(SRC_SYSTEM_API_DIR)/*.txt)) \
+                        )\
+               ))
+
+LOCAL_APIDIFF_OLDAPI := $(LOCAL_PATH)/../../$(SRC_SYSTEM_API_DIR)/$(last_released_sdk_version)
+LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_SYSTEM_API_FILE))
+
+include $(BUILD_APIDIFF)
+
+# Hack to get diffs included in docs output
+out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
+$(out_zip): $(full_target)
 
 # ====  the api stubs and current.xml ===========================
 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)
@@ -937,22 +350,59 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -removedApi $(INTERNAL_PLATFORM_REMOVED_API_FILE) \
                -nodocs
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 LOCAL_UNINSTALLABLE_MODULE := true
 
 include $(BUILD_DROIDDOC)
 
-# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
-$(full_target): $(framework_built) $(gen)
-$(INTERNAL_PLATFORM_API_FILE): $(full_target)
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_API_FILE) \
+                                          $(INTERNAL_PLATFORM_REMOVED_API_FILE)
 $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))
 
+# ====  the metalava api stubs and current.xml ===========================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+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)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := metalava-api-stubs
+LOCAL_DROIDDOC_USE_METALAVA := true
+LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
+LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
+LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual
+
+LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/src
+
+INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava_public_api.txt
+INTERNAL_PLATFORM_METALAVA_PUBLIC_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava_removed.txt
+
+LOCAL_DROIDDOC_OPTIONS:=\
+               $(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \
+               --api $(INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE) \
+               --removed-api $(INTERNAL_PLATFORM_METALAVA_PUBLIC_REMOVED_API_FILE) \
+               -nodocs
+
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_DROIDDOC)
+
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE) \
+                                          $(INTERNAL_PLATFORM_METALAVA_PUBLIC_REMOVED_API_FILE)
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_METALAVA_PUBLIC_API_FILE))
+
 # ====  the system api stubs ===================================
 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)
@@ -970,24 +420,64 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -showAnnotation android.annotation.SystemApi \
                -api $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \
                -removedApi $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
+               -exactApi $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE) \
                -nodocs
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 LOCAL_UNINSTALLABLE_MODULE := true
 
 include $(BUILD_DROIDDOC)
 
-# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
-$(full_target): $(framework_built) $(gen)
-$(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target)
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_SYSTEM_API_FILE) \
+                                          $(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE) \
+                                          $(INTERNAL_PLATFORM_SYSTEM_EXACT_API_FILE)
 $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))
 
+# ====  the metalava system api stubs ===================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+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)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := metalava-system-api-stubs
+LOCAL_DROIDDOC_USE_METALAVA := true
+LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
+LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
+LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual
+
+LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_system_stubs_current_intermediates/src
+
+INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-system-api.txt
+INTERNAL_PLATFORM_METALAVA_SYSTEM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-system-removed.txt
+
+LOCAL_DROIDDOC_OPTIONS:=\
+               $(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \
+               --show-annotation android.annotation.SystemApi \
+               --api $(INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE) \
+               --removed-api $(INTERNAL_PLATFORM_METALAVA_SYSTEM_REMOVED_API_FILE) \
+               -nodocs
+
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_DROIDDOC)
+
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE) \
+                                          $(INTERNAL_PLATFORM_METALAVA_SYSTEM_REMOVED_API_FILE) \
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_METALAVA_SYSTEM_API_FILE))
+
 # ====  the test api stubs ===================================
 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)
@@ -1006,24 +496,100 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -showAnnotation android.annotation.TestApi \
                -api $(INTERNAL_PLATFORM_TEST_API_FILE) \
                -removedApi $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \
+               -exactApi $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE) \
                -nodocs
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 LOCAL_UNINSTALLABLE_MODULE := true
 
 include $(BUILD_DROIDDOC)
 
-# $(gen), i.e. framework.aidl, is also needed while building against the current stub.
-$(full_target): $(framework_built) $(gen)
-$(INTERNAL_PLATFORM_TEST_API_FILE): $(full_target)
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_TEST_API_FILE) \
+                                          $(INTERNAL_PLATFORM_TEST_REMOVED_API_FILE) \
+                                          $(INTERNAL_PLATFORM_TEST_EXACT_API_FILE)
 $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))
 
+# ====  the metalava test api stubs ===================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+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)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := metalava-test-api-stubs
+LOCAL_DROIDDOC_USE_METALAVA := true
+LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
+LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
+LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual
+
+LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src
+
+INTERNAL_PLATFORM_METALAVA_TEST_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-test-api.txt
+INTERNAL_PLATFORM_METALAVA_TEST_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava-test-removed.txt
+
+LOCAL_DROIDDOC_OPTIONS:=\
+               $(framework_metalava_docs_LOCAL_DROIDDOC_OPTIONS) \
+               --show-annotation android.annotation.TestApi \
+               --api $(INTERNAL_PLATFORM_METALAVA_TEST_API_FILE) \
+               --removed-api $(INTERNAL_PLATFORM_METALAVA_TEST_REMOVED_API_FILE) \
+               -nodocs
+
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_DROIDDOC)
+
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_METALAVA_TEST_API_FILE) \
+                                          $(INTERNAL_PLATFORM_METALAVA_TEST_REMOVED_API_FILE) \
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_METALAVA_TEST_API_FILE))
+
+# ====  the complete hidden api list ===================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
+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)
+LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := hidden-api-list
+
+LOCAL_DROIDDOC_OPTIONS:=\
+               $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+               -referenceonly \
+               -showUnannotated \
+               -showAnnotation android.annotation.SystemApi \
+               -showAnnotation android.annotation.TestApi \
+               -dexApi $(INTERNAL_PLATFORM_DEX_API_FILE) \
+               -privateDexApi $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \
+               -removedDexApi $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \
+               -nodocs
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
+
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_DROIDDOC)
+
+$(full_target): .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_DEX_API_FILE) \
+                                          $(INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE) \
+                                          $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)
+
 # ====  check javadoc comments but don't generate 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)
@@ -1038,15 +604,12 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -referenceonly \
                -parsecomments
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 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)
-
 # Run this for checkbuild
 checkbuild: doc-comment-check-docs
 # Check comment when you are updating the API
@@ -1056,7 +619,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)
@@ -1074,7 +638,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -sdkvalues $(OUT_DOCS) \
                -hdf android.whichdoc offline
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 include $(BUILD_DROIDDOC)
 
@@ -1085,14 +649,14 @@ $(static_doc_index_redirect): \
        $(hide) $(ACP) $< $@
 
 $(full_target): $(static_doc_index_redirect)
-$(full_target): $(framework_built)
 
 
-# ====  static html in the sdk ==================================
+# ==== Public API static reference 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)
@@ -1111,16 +675,58 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -hdf android.whichdoc offline \
                -referenceonly
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 include $(BUILD_DROIDDOC)
 
 static_doc_index_redirect := $(out_dir)/index.html
-$(static_doc_index_redirect): \
-       $(LOCAL_PATH)/docs/docs-documentation-redirect.html | $(ACP)
+$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-documentation-redirect.html
+       $(copy-file-to-target)
+
+static_doc_properties := $(out_dir)/source.properties
+$(static_doc_properties): \
+       $(LOCAL_PATH)/docs/source.properties | $(ACP)
        $(hide) mkdir -p $(dir $@)
        $(hide) $(ACP) $< $@
 
+$(full_target): $(static_doc_index_redirect)
+$(full_target): $(static_doc_properties)
+
+
+# ==== System API static reference docs ==================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
+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)
+LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
+LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR)
+LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)
+
+LOCAL_MODULE := offline-system-sdk-referenceonly
+
+LOCAL_DROIDDOC_OPTIONS:=\
+               $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+               -hide 101 -hide 104 -hide 108 \
+               -showAnnotation android.annotation.SystemApi \
+               -offlinemode \
+               -title "Android System SDK" \
+               -proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
+               -sdkvalues $(OUT_DOCS) \
+               -hdf android.whichdoc offline \
+               -referenceonly
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
+
+include $(BUILD_DROIDDOC)
+
+static_doc_index_redirect := $(out_dir)/index.html
+$(static_doc_index_redirect): $(LOCAL_PATH)/docs/docs-documentation-redirect.html
+       $(copy-file-to-target)
+
 static_doc_properties := $(out_dir)/source.properties
 $(static_doc_properties): \
        $(LOCAL_PATH)/docs/source.properties | $(ACP)
@@ -1136,7 +742,8 @@ $(full_target): $(framework_built)
 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)
@@ -1156,17 +763,16 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -hdf android.hasSamples true \
                -samplesdir $(samples_dir)
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 include $(BUILD_DROIDDOC)
 
 # ==== docs for the web (on the androiddevdocs app engine server) =======================
-# TODO: Fix the System API docs build.
-ifneq ($(filter online-system-api-sdk-docs,$(MAKECMDGOALS)),)
 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)
@@ -1192,17 +798,17 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -hdf android.hasSamples true \
                -samplesdir $(samples_dir)
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
-# Don't build by default
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
+
 LOCAL_UNINSTALLABLE_MODULE := true
 
 include $(BUILD_DROIDDOC)
-endif  # online-system-api-sdk-docs in make command line.
 
 # ==== 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)
@@ -1220,18 +826,20 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -toroot / \
                -hdf android.whichdoc online \
                -devsite \
+               -yamlV2 \
                $(sample_groups) \
                -hdf android.hasSamples true \
                -samplesdir $(samples_dir)
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 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)
@@ -1252,7 +860,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -devsite \
                -ignoreJdLinks
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 include $(BUILD_DROIDDOC)
 
@@ -1260,7 +868,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)
@@ -1277,7 +886,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -atLinksNavtree \
                -navtreeonly
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 include $(BUILD_DROIDDOC)
 
@@ -1285,7 +894,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)
@@ -1305,7 +915,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
                -hdf android.hasSamples true \
                -samplesdir $(samples_dir)
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=external/doclava/res/assets/templates-sdk
 
 include $(BUILD_DROIDDOC)
 
@@ -1313,7 +923,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)
@@ -1328,39 +939,171 @@ LOCAL_DROIDDOC_OPTIONS:=\
                -title "Android SDK - Including hidden APIs."
 #              -hidden
 
-LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
+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  =========================================
+# ====  java proto host library  ==============================
+include $(CLEAR_VARS)
+LOCAL_MODULE := platformprotos
+LOCAL_PROTOC_OPTIMIZE_TYPE := full
+LOCAL_PROTOC_FLAGS := \
+    -Iexternal/protobuf/src
+LOCAL_SOURCE_FILES_ALL_GENERATED := true
+LOCAL_SRC_FILES := \
+    cmds/am/proto/instrumentation_data.proto \
+    cmds/statsd/src/perfetto/perfetto_config.proto \
+    $(call all-proto-files-under, core/proto) \
+    $(call all-proto-files-under, libs/incident/proto) \
+    $(call all-proto-files-under, cmds/statsd/src)
+# b/72714520
+LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+# ====  java proto device library (for test only)  ==============================
+include $(CLEAR_VARS)
+LOCAL_MODULE := platformprotosnano
+LOCAL_MODULE_TAGS := tests
+LOCAL_PROTOC_OPTIMIZE_TYPE := nano
+LOCAL_PROTOC_FLAGS := \
+    -Iexternal/protobuf/src
+LOCAL_PROTO_JAVA_OUTPUT_PARAMS := \
+    store_unknown_fields = true
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := \
+    $(call all-proto-files-under, core/proto) \
+    $(call all-proto-files-under, libs/incident/proto/android/os)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+# ====  java proto device library (for test only)  ==============================
+include $(CLEAR_VARS)
+LOCAL_MODULE := platformprotoslite
+LOCAL_MODULE_TAGS := tests
+LOCAL_PROTOC_OPTIMIZE_TYPE := lite
+LOCAL_PROTOC_FLAGS := \
+    -Iexternal/protobuf/src
+LOCAL_SRC_FILES := \
+    $(call all-proto-files-under, core/proto) \
+    $(call all-proto-files-under, libs/incident/proto/android/os)
+# Protos have lots of MissingOverride and similar.
+LOCAL_ERROR_PRONE_FLAGS := -XepDisableAllChecks
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# ==== hiddenapi lists =======================================
 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
+# File names of final API lists
+LOCAL_LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)
+LOCAL_DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST)
+LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)
+
+# File names of source files we will use to generate the final API lists.
+LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt
+LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt
+LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt
+LOCAL_SRC_PUBLIC_API := frameworks/base/config/hiddenapi-public-dex.txt
+LOCAL_SRC_PRIVATE_API := frameworks/base/config/hiddenapi-private-dex.txt
+LOCAL_SRC_REMOVED_API := frameworks/base/config/hiddenapi-removed-dex.txt
+
+LOCAL_SRC_ALL := \
+       $(LOCAL_SRC_GREYLIST) \
+       $(LOCAL_SRC_VENDOR_LIST) \
+       $(LOCAL_SRC_FORCE_BLACKLIST) \
+       $(LOCAL_SRC_PUBLIC_API) \
+       $(LOCAL_SRC_PRIVATE_API) \
+       $(LOCAL_SRC_REMOVED_API)
+
+define assert-has-no-overlap
+if [ ! -z "`comm -12 <(sort $(1)) <(sort $(2))`" ]; then \
+       echo "$(1) and $(2) should not overlap" 1>&2; \
+       comm -12 <(sort $(1)) <(sort $(2)) 1>&2; \
+       exit 1; \
+fi
+endef
 
-ifneq ($(INCREMENTAL_BUILDS),)
-    LOCAL_PROGUARD_ENABLED := disabled
-    LOCAL_JACK_ENABLED := incremental
-endif
+define assert-is-subset
+if [ ! -z "`comm -23 <(sort $(1)) <(sort $(2))`" ]; then \
+       echo "$(1) must be a subset of $(2)" 1>&2; \
+       comm -23 <(sort $(1)) <(sort $(2)) 1>&2; \
+       exit 1; \
+fi
+endef
 
-include $(BUILD_JAVA_LIBRARY)
+define assert-has-no-duplicates
+if [ ! -z "`sort $(1) | uniq -D`" ]; then \
+       echo "$(1) has duplicate entries" 1>&2; \
+       sort $(1) | uniq -D 1>&2; \
+       exit 1; \
+fi
+endef
 
+# The following rules build API lists in the build folder.
+# By not using files from the source tree, ART buildbots can mock these lists
+# or have alternative rules for building them. Other rules in the build system
+# should depend on the files in the build folder.
+
+# Merge light greylist from multiple files:
+#  (1) manual greylist LOCAL_SRC_GREYLIST
+#  (2) list of usages from vendor apps LOCAL_SRC_VENDOR_LIST
+#  (3) list of removed APIs in LOCAL_SRC_REMOVED_API
+#      @removed does not imply private in Doclava. We must take the subset also
+#      in LOCAL_SRC_PRIVATE_API.
+#  (4) list of serialization APIs
+#      Automatically adds all methods which match the signatures in
+#      REGEX_SERIALIZATION. These are greylisted in order to allow applications
+#      to write their own serializers.
+$(LOCAL_LIGHT_GREYLIST): REGEX_SERIALIZATION := \
+    "readObject\(Ljava/io/ObjectInputStream;\)V" \
+    "readObjectNoData\(\)V" \
+    "readResolve\(\)Ljava/lang/Object;" \
+    "serialVersionUID:J" \
+    "serialPersistentFields:\[Ljava/io/ObjectStreamField;" \
+    "writeObject\(Ljava/io/ObjectOutputStream;\)V" \
+    "writeReplace\(\)Ljava/lang/Object;"
+$(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL)
+       sort $(LOCAL_SRC_GREYLIST) $(LOCAL_SRC_VENDOR_LIST) \
+            <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" \
+                      $(LOCAL_SRC_PRIVATE_API)) \
+            <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \
+            > $@
+       $(call assert-has-no-duplicates,$@)
+       $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
+       $(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))
+
+# Generate dark greylist as remaining classes and class members in the same
+# package as classes listed in the light greylist.
+# The algorithm is as follows:
+#   (1) extract the class descriptor from each entry in LOCAL_LIGHT_GREYLIST
+#   (2) strip everything after the last forward-slash,
+#       e.g. 'Lpackage/subpackage/class$inner;' turns into 'Lpackage/subpackage/'
+#   (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the package
+#       name but do not contain another forward-slash in the class name, e.g.
+#       matching '^Lpackage/subpackage/[^/;]*;'
+#   (4) subtract entries shared with LOCAL_LIGHT_GREYLIST
+$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST)
+       comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \
+                <(cat $(LOCAL_SRC_PUBLIC_API) $(LOCAL_LIGHT_GREYLIST) | \
+                      sed 's/\->.*//' | sed 's/\(.*\/\).*/\1/' | sort | uniq | \
+                      while read PKG_NAME; do \
+                          grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \
+                      done | sort | uniq) \
+                > $@
+       $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
+       $(call assert-has-no-duplicates,$@)
+       $(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST))
+       $(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST))
+
+# Generate blacklist as private API minus (light greylist plus dark greylist).
+$(LOCAL_BLACKLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)
+       comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)) \
+                <(sort $(LOCAL_SRC_PRIVATE_API)) \
+                > $@
+       $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API))
+       $(call assert-has-no-duplicates,$@)
+       $(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST))
+       $(call assert-has-no-overlap,$@,$(LOCAL_DARK_GREYLIST))
+       $(call assert-is-subset,$(LOCAL_SRC_FORCE_BLACKLIST),$@)
 
 # Include subdirectory makefiles
 # ============================================================