Merge "Format Android.bp files" into main (db8d8678) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+31 −31

Original line number	Diff line number	Diff line
		@@ -17,19 +17,19 @@ aidl_library {
		filegroup {
		name: "framework-core-sources",
		srcs: [
		"*/.java",
		"*/.aidl",
		":systemfeatures-gen-srcs",
		"*/.java",
		":framework-nfc-non-updatable-sources",
		":messagequeue-gen",
		":ranging_stack_mock_initializer",
		":systemfeatures-gen-srcs",
		],
		// Exactly one MessageQueue.java will be added to srcs by messagequeue-gen
		exclude_srcs: [
		"*/_ravenwood.java",
		":dynamic_instrumentation_manager_aidl_sources",
		"android/os/MessageQueue//.java",
		"android/ranging/*/.java",
		":dynamic_instrumentation_manager_aidl_sources",
		"*/_ravenwood.java",
		],
		visibility: ["//frameworks/base"],
		}
		@@ -52,9 +52,9 @@ soong_config_module_type {
		"release_ranging_stack",
		],
		properties: [
		"srcs",
		"cmd",
		"out",
		"srcs",
		],
		}

		@@ -153,9 +153,9 @@ filegroup {
		filegroup {
		name: "framework-core-sources-for-test-mock",
		srcs: [
		"android/accounts/AccountManager.java",
		"android/accounts/AccountManagerCallback.java",
		"android/accounts/AccountManagerFuture.java",
		"android/accounts/AccountManager.java",
		"android/accounts/AccountsException.java",
		"android/accounts/AuthenticatorException.java",
		"android/accounts/OperationCanceledException.java",
		@@ -163,8 +163,8 @@ filegroup {
		"android/app/IApplicationThread.aidl",
		"android/app/IServiceConnection.aidl",
		"android/app/PackageDeleteObserver.java",
		"android/content/ComponentCallbacks2.java",
		"android/content/ComponentCallbacks.java",
		"android/content/ComponentCallbacks2.java",
		"android/content/ContentInterface.java",
		"android/content/ContentProvider.java",
		"android/content/ContentProviderNative.java",
		@@ -178,8 +178,8 @@ filegroup {
		"android/content/OperationApplicationException.java",
		"android/content/pm/ActivityInfo.java",
		"android/content/pm/ApplicationInfo.java",
		"android/content/pm/InstantAppInfo.java",
		"android/content/pm/IPackageDataObserver.aidl",
		"android/content/pm/InstantAppInfo.java",
		"android/content/pm/KeySet.java",
		"android/content/pm/PackageManager.java",
		"android/content/pm/VerifierDeviceIdentity.java",
		@@ -192,8 +192,8 @@ filegroup {
		"android/os/Bundle.java",
		"android/os/IBinder.java",
		"android/os/IInterface.java",
		"android/os/Parcelable.java",
		"android/os/ParcelFileDescriptor.java",
		"android/os/Parcelable.java",
		"android/os/RemoteException.java",
		"android/os/storage/VolumeInfo.java",
		"android/util/AndroidException.java",
		@@ -215,24 +215,24 @@ filegroup {
		filegroup {
		name: "libvibrator_aidl",
		srcs: [
		"android/os/ExternalVibrationScale.aidl",
		"android/os/IExternalVibrationController.aidl",
		"android/os/IExternalVibratorService.aidl",
		"android/os/ExternalVibrationScale.aidl",
		],
		}

		filegroup {
		name: "libpowermanager_aidl",
		srcs: [
		"android/os/Temperature.aidl",
		"android/os/CoolingDevice.aidl",
		"android/os/IPowerManager.aidl",
		"android/os/IScreenTimeoutPolicyListener.aidl",
		"android/os/IThermalEventListener.aidl",
		"android/os/IThermalHeadroomListener.aidl",
		"android/os/IThermalStatusListener.aidl",
		"android/os/IThermalService.aidl",
		"android/os/IPowerManager.aidl",
		"android/os/IThermalStatusListener.aidl",
		"android/os/IWakeLockCallback.aidl",
		"android/os/IScreenTimeoutPolicyListener.aidl",
		"android/os/Temperature.aidl",
		],
		}

		@@ -282,8 +282,8 @@ genrule {
		java_library {
		name: "uieventloggerlib",
		srcs: [
		"com/android/internal/logging/UiEventLoggerImpl.java",
		":statslog-framework-java-gen",
		"com/android/internal/logging/UiEventLoggerImpl.java",
		],
		libs: [
		"androidx.annotation_annotation",
		@@ -353,11 +353,11 @@ filegroup {
		name: "framework-permission-s-shared-srcs",
		srcs: [
		":modules-utils-preconditions-srcs",
		"com/android/internal/infra/AndroidFuture.java",
		"com/android/internal/infra/ServiceConnector.java",
		"android/os/HandlerExecutor.java",
		"com/android/internal/infra/AndroidFuture.aidl",
		"com/android/internal/infra/AndroidFuture.java",
		"com/android/internal/infra/IAndroidFuture.aidl",
		"android/os/HandlerExecutor.java",
		"com/android/internal/infra/ServiceConnector.java",
		],
		}

		@@ -393,10 +393,10 @@ filegroup {
		"android/content/pm/FileSystemControlParcel.aidl",
		"android/content/pm/IDataLoader.aidl",
		"android/content/pm/IDataLoaderManager.aidl",
		"android/content/pm/InstallationFileParcel.aidl",
		"android/content/pm/InstallationFileLocation.aidl",
		"android/content/pm/IDataLoaderStatusListener.aidl",
		"android/content/pm/IPackageInstallerSessionFileSystemConnector.aidl",
		"android/content/pm/InstallationFileLocation.aidl",
		"android/content/pm/InstallationFileParcel.aidl",
		],
		}

		@@ -404,9 +404,9 @@ filegroup {
		name: "incremental_manager_aidl",
		srcs: [
		"android/os/incremental/IIncrementalService.aidl",
		"android/os/incremental/IStorageHealthListener.aidl",
		"android/os/incremental/IStorageLoadingProgressListener.aidl",
		"android/os/incremental/IncrementalNewFileParams.aidl",
		"android/os/incremental/IStorageHealthListener.aidl",
		"android/os/incremental/PerUidReadTimeouts.aidl",
		"android/os/incremental/StorageHealthCheckParams.aidl",
		],
		@@ -422,15 +422,15 @@ filegroup {
		filegroup {
		name: "hwbinder-stubs-srcs",
		srcs: [
		"android/os/HidlSupport.java",
		"android/os/DeadObjectException.java",
		"android/os/DeadSystemException.java",
		"android/os/HidlMemory.java",
		"android/os/HidlSupport.java",
		"android/os/HwBinder.java",
		"android/os/HwBlob.java",
		"android/os/HwParcel.java",
		"android/os/IHwBinder.java",
		"android/os/IHwInterface.java",
		"android/os/DeadObjectException.java",
		"android/os/DeadSystemException.java",
		"android/os/NativeHandle.java",
		"android/os/RemoteException.java",
		"android/util/AndroidException.java",
		@@ -444,12 +444,12 @@ filegroup {
		cc_defaults {
		name: "incremental_default",
		cflags: [
		"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
		"-Wall",
		"-Werror",
		"-Wextra",
		"-Wextra-semi",
		"-Werror",
		"-Wzero-as-null-pointer-constant",
		"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
		],
		shared_libs: [
		"libbinder",
		@@ -489,8 +489,8 @@ cc_library {
		],
		defaults: ["incremental_default"],
		shared_libs: [
		"libincremental_aidl-cpp",
		"libdataloader_aidl-cpp",
		"libincremental_aidl-cpp",
		],
		}

		@@ -580,8 +580,8 @@ filegroup {
		filegroup {
		name: "framework-telephony-common-shared-srcs",
		srcs: [
		"android/os/RegistrantList.java",
		"android/os/Registrant.java",
		"android/os/RegistrantList.java",
		"android/util/IndentingPrintWriter.java",
		"android/util/LocalLog.java",
		"android/util/TimeUtils.java",
		@@ -599,8 +599,8 @@ filegroup {
		name: "framework-ims-common-shared-srcs",
		srcs: [
		":modules-utils-preconditions-srcs",
		"android/os/RegistrantList.java",
		"android/os/Registrant.java",
		"android/os/RegistrantList.java",
		"com/android/internal/os/SomeArgs.java",
		],
		}
		@@ -609,9 +609,9 @@ filegroup {
		filegroup {
		name: "framework-core-sources-for-fuzzers",
		srcs: [
		"android/os/IInterface.java",
		"android/os/Binder.java",
		"android/os/IBinder.java",
		"android/os/IInterface.java",
		"android/os/Parcelable.java",
		],
		}
		@@ -693,8 +693,8 @@ java_library {
		java_library {
		name: "protolog-groups",
		srcs: [
		"com/android/internal/protolog/WmProtoLogGroups.java",
		":protolog-common-src",
		"com/android/internal/protolog/WmProtoLogGroups.java",
		],
		}

libs/WindowManager/Shell/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -161,10 +161,11 @@ android_library {
		srcs: [
		":wm_shell_protolog_src",
		// TODO(b/168581922) protologtool do not support kotlin(*.kt)
		"src/com/android/wm/shell/EventLogTags.logtags",
		":wm_shell-aidls",
		":wm_shell-shared-aidls",
		":wm_shell-sources-kt",
		":wm_shell_protolog_src",
		"src/com/android/wm/shell/EventLogTags.logtags",
		],
		resource_dirs: [
		"res",

tools/protologtool/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -10,14 +10,14 @@ package {
		java_library_host {
		name: "protologtool-lib",
		srcs: [
		"src/com/android/protolog/tool/*/.kt",
		":protolog-common-src",
		"src/com/android/protolog/tool/*/.kt",
		],
		static_libs: [
		"javaparser",
		"platformprotos",
		"jsonlib",
		"perfetto_trace-full",
		"platformprotos",
		],
		}

		@@ -39,10 +39,10 @@ java_test_host {
		unit_test: true,
		},
		static_libs: [
		"protologtool-lib",
		"junit",
		"mockito",
		"objenesis",
		"protologtool-lib",
		"truth",
		],
		}