Merge "Merge Android Pie into master" (e80b4550) · Commits · e / os / android_frameworks_base

Android.bp

+198 −49

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ java_library {
		"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",
		@@ -98,6 +99,8 @@ java_library {
		"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",
		@@ -113,10 +116,12 @@ java_library {
		"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",
		@@ -125,7 +130,6 @@ java_library {
		"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",
		@@ -144,12 +148,13 @@ java_library {
		":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/IFingerprintClientActiveCallback.aidl",
		"core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl",
		"core/java/android/hardware/hdmi/IHdmiControlCallback.aidl",
		"core/java/android/hardware/hdmi/IHdmiControlService.aidl",
		@@ -171,7 +176,12 @@ java_library {
		"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",
		@@ -208,14 +218,12 @@ java_library {
		"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/IBatteryPropertiesListener.aidl",
		"core/java/android/os/IBatteryPropertiesRegistrar.aidl",
		"core/java/android/os/ICancellationSignal.aidl",
		"core/java/android/os/IDeviceIdentifiersPolicyService.aidl",
		"core/java/android/os/IDeviceIdleController.aidl",
		"core/java/android/os/IHardwarePropertiesManager.aidl",
		"core/java/android/os/IIncidentManager.aidl",
		"core/java/android/os/IIncidentReportCompletedListener.aidl",
		"core/java/android/os/IIncidentReportStatusListener.aidl",
		"core/java/android/os/IMaintenanceActivityListener.aidl",
		"core/java/android/os/IMessenger.aidl",
		@@ -229,6 +237,9 @@ java_library {
		"core/java/android/os/IRecoverySystemProgressListener.aidl",
		"core/java/android/os/IRemoteCallback.aidl",
		"core/java/android/os/ISchedulingPolicyService.aidl",
		"core/java/android/os/IStatsCompanionService.aidl",
		"core/java/android/os/IStatsManager.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",
		@@ -238,9 +249,10 @@ java_library {
		"core/java/android/os/storage/IStorageEventListener.aidl",
		"core/java/android/os/storage/IStorageShutdownObserver.aidl",
		"core/java/android/os/storage/IObbActionListener.aidl",
		"core/java/android/security/IKeystoreService.aidl",
		":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",
		@@ -265,6 +277,7 @@ java_library {
		"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",
		@@ -305,6 +318,10 @@ java_library {
		"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",
		@@ -322,6 +339,10 @@ java_library {
		"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",
		@@ -335,9 +356,9 @@ java_library {
		"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/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",
		@@ -352,8 +373,8 @@ java_library {
		"core/java/com/android/internal/appwidget/IAppWidgetHost.aidl",
		"core/java/com/android/internal/backup/IBackupTransport.aidl",
		"core/java/com/android/internal/backup/IObbBackupService.aidl",
		"core/java/com/android/internal/car/ICarServiceHelper.aidl",
		"core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl",
		"core/java/com/android/internal/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",
		@@ -383,7 +404,6 @@ java_library {
		"core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl",
		"core/java/com/android/internal/widget/ILockSettings.aidl",
		"core/java/com/android/internal/widget/IRemoteViewsFactory.aidl",
		"core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl",
		"keystore/java/android/security/IKeyChainAliasCallback.aidl",
		"keystore/java/android/security/IKeyChainService.aidl",
		"location/java/android/location/IBatchedLocationCallback.aidl",
		@@ -401,9 +421,10 @@ java_library {
		"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/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",
		@@ -412,7 +433,8 @@ java_library {
		"media/java/android/media/IMediaScannerListener.aidl",
		"media/java/android/media/IMediaScannerService.aidl",
		"media/java/android/media/IPlaybackConfigDispatcher.aidl",
		"media/java/android/media/IPlayer.aidl",
		"media/java/android/media/ISessionTokensListener.aidl",
		":libaudioclient_aidl",
		"media/java/android/media/IRecordingConfigDispatcher.aidl",
		"media/java/android/media/IRemoteDisplayCallback.aidl",
		"media/java/android/media/IRemoteDisplayProvider.aidl",
		@@ -439,6 +461,8 @@ java_library {
		"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",
		@@ -546,13 +570,17 @@ java_library {
		"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/aware/IWifiAwareDiscoverySessionCallback.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",
		"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",
		@@ -561,7 +589,9 @@ java_library {

		":libupdate_engine_aidl",

		":storaged_aidl",
		":netd_aidl",
		":vold_aidl",
		":installd_aidl",

		"lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl",
		@@ -575,9 +605,14 @@ java_library {
		"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",

		":framework-statslog-gen",
		],

		aidl: {
		@@ -605,14 +640,25 @@ java_library {
		"system/update_engine/binder_bindings",
		"frameworks/native/aidl/binder",
		"frameworks/av/camera/aidl",
		"frameworks/av/media/libaudioclient/aidl",
		"frameworks/native/aidl/gui",
		"system/core/storaged/binder",
		"system/netd/server/binder",
		"system/vold/binder",
		"system/bt/binder",
		"system/security/keystore/binder",
		],

		generate_get_transaction_name: true
		},

		exclude_srcs: [
		// See comment on framework-atb-backward-compatibility module below
		"core/java/android/content/pm/AndroidTestBaseUpdater.java",
		// See comment on framework-oahl-backward-compatibility module below
		"core/java/android/content/pm/OrgApacheHttpLegacyUpdater.java",
		],

		no_framework_libs: true,
		libs: [
		"conscrypt",
		@@ -625,19 +671,25 @@ java_library {
		"framework-protos",
		"android.hidl.base-V1.0-java",
		"android.hardware.cas-V1.0-java",
		"android.hardware.contexthub-V1.0-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.tv.input-V1.0-java-constants",
		"android.hardware.usb-V1.0-java-constants",
		"android.hardware.usb-V1.1-java-constants",
		"android.hardware.vibrator-V1.0-java-constants",
		"android.hardware.vibrator-V1.1-java-constants",
		"android.hardware.vibrator-V1.0-java",
		"android.hardware.vibrator-V1.1-java",
		"android.hardware.vibrator-V1.2-java",
		"android.hardware.wifi-V1.0-java-constants",
		"android.hardware.radio-V1.0-java",
		"android.hardware.usb.gadget-V1.0-java",
		],

		// Loaded with System.loadLibrary by android.view.textclassifier
		required: ["libtextclassifier"],
		required: [
		"libtextclassifier",
		"libmedia2_jni",
		],

		javac_shard_size: 150,

		@@ -647,6 +699,38 @@ java_library {
		],
		}

		// A temporary build target that is conditionally included on the bootclasspath if
		// org.apache.http.legacy library has been removed and which provides support for
		// maintaining backwards compatibility for APKs that target pre-P and depend on
		// org.apache.http.legacy classes. This is used iff REMOVE_OAHL_FROM_BCP=true is
		// specified on the build command line.
		java_library {
		name: "framework-oahl-backward-compatibility",
		installable: true,
		srcs: [
		"core/java/android/content/pm/OrgApacheHttpLegacyUpdater.java",
		],
		}

		// A temporary build target that is conditionally included on the bootclasspath if
		// android.test.base library has been removed and which provides support for
		// maintaining backwards compatibility for APKs that target pre-P and depend on
		// android.test.base classes. This is used iff REMOVE_ATB_FROM_BCP=true is
		// specified on the build command line.
		java_library {
		name: "framework-atb-backward-compatibility",
		srcs: [
		"core/java/android/content/pm/AndroidTestBaseUpdater.java",
		],
		}

		genrule {
		name: "framework-statslog-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out)",
		out: ["android/util/StatsLogInternal.java"],
		}

		gensrcs {
		name: "framework-javastream-protos",
		depfile: true,
		@@ -667,7 +751,10 @@ gensrcs {
		" $(in) " +
		"&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",

		srcs: ["core/proto/*/.proto"],
		srcs: [
		"core/proto/*/.proto",
		"libs/incident/*/.proto",
		],
		output_extension: "srcjar",
		}

		@@ -681,10 +768,29 @@ java_library {
		"libphonenumber-platform",
		"nist-sip",
		"tagsoup",
		"rappor",
		],
		dxflags: ["--core-library"],
		}

		// ==== java proto host library ==============================
		java_library_host {
		name: "platformprotos",
		srcs: [
		"cmds/am/proto/instrumentation_data.proto",
		"core/proto/*/.proto",
		"libs/incident/proto/*/.proto",
		"cmds/statsd/src/*/.proto",
		],
		proto: {
		include_dirs: ["external/protobuf/src"],
		type: "full",
		},
		errorprone: {
		javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520
		},
		}

		// ==== c++ proto device library ==============================
		cc_library {
		name: "libplatformprotos",
		@@ -699,26 +805,22 @@ cc_library {
		"-Werror",
		"-Wno-unused-parameter",
		],

		srcs: [
		"core/proto/*/.proto",
		"libs/incident/*/.proto",
		],

		target: {
		host: {
		proto: {
		type: "full",
		},
		srcs: [
		"core/proto/*/.proto",
		"libs/incident/*/.proto",
		],
		},
		android: {
		proto: {
		type: "lite",
		},
		// We only build the protos that are optimized for the lite
		// runtime, as well as the only protos that are actually
		// needed by the device.
		srcs: [
		"core/proto/android/service/graphicsstats.proto",
		],
		shared: {
		enabled: false,
		},
		@@ -726,6 +828,41 @@ cc_library {
		},
		}

		gensrcs {
		name: "gen-platform-proto-constants",
		depfile: true,

		tools: [
		"aprotoc",
		"protoc-gen-cppstream",
		],

		srcs: [
		"core/proto/android/os/backtrace.proto",
		"core/proto/android/os/batterytype.proto",
		"core/proto/android/os/cpufreq.proto",
		"core/proto/android/os/cpuinfo.proto",
		"core/proto/android/os/kernelwake.proto",
		"core/proto/android/os/pagetypeinfo.proto",
		"core/proto/android/os/procrank.proto",
		"core/proto/android/os/ps.proto",
		"core/proto/android/os/system_properties.proto",
		"core/proto/android/util/event_log_tags.proto",
		],

		// Append protoc-gen-cppstream tool's PATH otherwise aprotoc can't find the plugin tool
		cmd: "mkdir -p $(genDir) " +
		"&& $(location aprotoc) " +
		" --plugin=$(location protoc-gen-cppstream) " +
		" --dependency_out=$(depfile) " +
		" --cppstream_out=$(genDir) " +
		" -Iexternal/protobuf/src " +
		" -I . " +
		" $(in)",

		output_extension: "proto.h",
		}

		subdirs = [
		"cmds/*",
		"core/*",
		@@ -869,11 +1006,6 @@ framework_docs_args = "-android -manifest $(location core/res/AndroidManifest.xm
		doc_defaults {
		name: "api-stubs-default",
		srcs: [
		// test mock src files.
		"test-mock/src/android/test/mock/*/.java",
		// test runner excluding mock src files.
		"test-runner/src/*/.java",
		"test-base/src/*/.java",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":openjdk_javadoc_files",
		@@ -920,15 +1052,6 @@ doc_defaults {
		installable: false,
		}

		check_last_released_api_args = "-hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 -hide 26 -hide 27 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 " +
		"-error 16 -error 17 -error 18"

		check_current_api_args = "-error 2 -error 3 -error 4 -error 5 -error 6 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 "+
		"-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 " +
		"-error 25 -error 26 -error 27"

		droiddoc {
		name: "api-stubs-docs",
		defaults: ["api-stubs-default"],
		@@ -947,12 +1070,17 @@ droiddoc {
		last_released: {
		api_file: ":last-released-public-api",
		removed_api_file: "api/removed.txt",
		args: check_last_released_api_args,
		args: "-hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 -hide 26 -hide 27 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 " +
		"-error 16 -error 17 -error 18 -error 31",
		},
		current: {
		api_file: "api/current.txt",
		removed_api_file: "api/removed.txt",
		args: check_current_api_args,
		args: "-error 2 -error 3 -error 4 -error 5 -error 6 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 " +
		"-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 " +
		"-error 25 -error 26 -error 27",
		},
		},
		}
		@@ -969,8 +1097,6 @@ droiddoc {
		],
		api_tag_name: "SYSTEM",
		api_filename: "system-api.txt",
		private_api_filename: "system-private.txt",
		private_dex_api_filename: "system-private-dex.txt",
		removed_api_filename: "system-removed.txt",
		exact_api_filename: "system-exact.txt",
		args: framework_docs_args + " -referenceonly -showAnnotation android.annotation.SystemApi -nodocs",
		@@ -978,12 +1104,17 @@ droiddoc {
		last_released: {
		api_file: ":last-released-system-api",
		removed_api_file: "api/system-removed.txt",
		args: check_last_released_api_args,
		args: "-hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 -hide 26 -hide 27 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 " +
		"-error 16 -error 17 -error 18 -error 31",
		},
		current: {
		api_file: "api/system-current.txt",
		removed_api_file: "api/system-removed.txt",
		args: check_current_api_args,
		args: "-error 2 -error 3 -error 4 -error 5 -error 6 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 " +
		"-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 " +
		"-error 25 -error 26 -error 27",
		},
		},
		}
		@@ -1007,7 +1138,10 @@ droiddoc {
		current: {
		api_file: "api/test-current.txt",
		removed_api_file: "api/test-removed.txt",
		args: check_current_api_args,
		args: "-error 2 -error 3 -error 4 -error 5 -error 6 " +
		"-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 " +
		"-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 " +
		"-error 25 -error 26 -error 27",
		},
		},
		}
		@@ -1022,7 +1156,7 @@ doc_defaults {
		":non_openjdk_javadoc_files",
		":android_icu4j_src_files_for_docs",
		":gen-ojluni-jaif-annotated-srcs",
		":frameworks-data-binding-srcs",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",
		],
		exclude_srcs: [
		@@ -1132,6 +1266,21 @@ droiddoc {
		static_doc_properties: "docs/source.properties",
		}

		droiddoc {
		name: "offline-system-sdk-referenceonly-docs",
		defaults: ["framework-docs-default"],
		hdf: [
		"android.whichdoc offline",
		],
		proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt",
		args: framework_docs_args + " -hide 101 -hide 104 -hide 108" +
		" -showAnnotation android.annotation.SystemApi " +
		" -offlinemode -title \"Android System SDK\" -referenceonly",
		write_sdk_values: true,
		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
		static_doc_properties: "docs/source.properties",
		}

		droiddoc {
		name: "online-sdk-docs",
		defaults: ["framework-docs-default"],

Android.mk

+91 −33

File changed.

Preview size limit exceeded, changes collapsed.

CleanSpec.mk

+1 −0

File changed.

Preview size limit exceeded, changes collapsed.

PREUPLOAD.cfg

+5 −0

File changed.

Preview size limit exceeded, changes collapsed.

apct-tests/perftests/core/Android.mk

+8 −2

Original line number	Diff line number	Diff line
		@@ -4,12 +4,16 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_TAGS := tests

		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		src/android/os/ISomeService.aidl

		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-test \
		apct-perftests-utils \
		legacy-android-test
		guava

		LOCAL_JAVA_LIBRARIES := android.test.base

		LOCAL_PACKAGE_NAME := CorePerfTests
		LOCAL_PRIVATE_PLATFORM_APIS := true
		@@ -19,4 +23,6 @@ LOCAL_JNI_SHARED_LIBRARIES := libperftestscore_jni
		# Use google-fonts/dancing-script for the performance metrics
		LOCAL_ASSET_DIR := $(TOP)/external/google-fonts/dancing-script

		LOCAL_COMPATIBILITY_SUITE += device-tests

		include $(BUILD_PACKAGE)