Merge "Revert "Convert filegroup to library"" (0801f800) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+14 −8

Original line number	Diff line number	Diff line
		@@ -146,14 +146,11 @@ java_library {
		],
		}

		java_library {
		name: "modules-utils-locallog",
		srcs: ["android/util/LocalLog.java"],
		libs: ["unsupportedappusage"],
		sdk_version: "module_current",
		min_sdk_version: "30",
		apex_available: ["//apex_available:anyapex"],
		visibility: ["//visibility:public"],
		filegroup {
		name: "framework-services-net-module-wifi-shared-srcs",
		srcs: [
		"android/util/LocalLog.java",
		],
		}

		// keep these files in sync with the package/Tethering/jarjar-rules.txt and
		@@ -378,6 +375,15 @@ filegroup {
		],
		}

		// Avoid including Parcelable classes as we don't want to have two copies of
		// Parcelable cross the process.
		filegroup {
		name: "framework-cellbroadcast-shared-srcs",
		srcs: [
		"android/util/LocalLog.java",
		],
		}

		java_library {
		name: "modules-utils-statemachine",
		srcs: [

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ java_library_static {
		java_library {
		name: "services.net-module-wifi",
		srcs: [
		":framework-services-net-module-wifi-shared-srcs",
		":net-utils-services-common-srcs",
		],
		sdk_version: "module_current",