Merge "Convert sysui libs to java_library" into main (86fe22cd) · Commits · e / os / android_frameworks_base

packages/SystemUI/common/Android.bp

+1 −8

Original line number	Diff line number	Diff line
		@@ -22,20 +22,13 @@ package {
		default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],
		}

		android_library {

		java_library {
		name: "SystemUICommon",
		use_resource_processor: true,

		srcs: [
		"src/*/.java",
		"src/*/.kt",
		],

		static_libs: [
		"androidx.core_core-ktx",
		],

		manifest: "AndroidManifest.xml",
		kotlincflags: ["-Xjvm-default=all"],
		}

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.systemui.common">

		</manifest>

+6 −2

Original line number	Diff line number	Diff line
		# SystemUICommon

		`SystemUICommon` is a module within SystemUI that hosts standalone helper libraries. It is intended to be used by other modules, and therefore should not have other SystemUI dependencies to avoid circular dependencies.
		`SystemUICommon` is a module within SystemUI that hosts standalone helper libraries. It is intended
		to be used by other modules, and therefore should not have other SystemUI dependencies to avoid
		circular dependencies.

		To maintain the structure of this module, please refrain from adding components at the top level. Instead, add them to specific sub-packages, such as `systemui/common/buffer/`. This will help to keep the module organized and easy to navigate.
		To maintain the structure of this module, please refrain from adding components at the top level.
		Instead, add them to specific sub-packages, such as `systemui/common/buffer/`. This will help to
		keep the module organized and easy to navigate.

+1 −5

Original line number	Diff line number	Diff line
		@@ -22,19 +22,15 @@ package {
		default_applicable_licenses: ["frameworks_base_packages_SystemUI_license"],
		}

		android_library {
		java_library {
		name: "SystemUILogLib",
		use_resource_processor: true,
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		],
		static_libs: [
		"androidx.core_core-ktx",
		"androidx.annotation_annotation",
		"error_prone_annotations",
		"SystemUICommon",
		],
		manifest: "AndroidManifest.xml",
		kotlincflags: ["-Xjvm-default=all"],
		}

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2023 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.systemui.log">


		</manifest>