Merge "framework-wifi: remove duplicate classes" am: 51090a3fed (aadef559) · Commits · e / os / android_frameworks_base

Android.bp

+19 −2

Original line number	Diff line number	Diff line
		@@ -647,15 +647,32 @@ filegroup {
		],
		}

		// utility classes statically linked into framework-wifi and dynamically linked
		// into wifi-service
		java_library {
		name: "framework-wifi-util-lib",
		sdk_version: "module_current",
		srcs: [
		"core/java/android/net/shared/Inet4AddressUtils.java",
		"core/java/com/android/internal/util/Preconditions.java",
		],
		libs: [
		"framework-annotations-lib",
		"unsupportedappusage",
		],
		visibility: [
		"//frameworks/base/wifi",
		"//frameworks/base/services/net",
		],
		}

		filegroup {
		name: "framework-services-net-module-wifi-shared-srcs",
		srcs: [
		"core/java/android/net/DhcpResults.java",
		"core/java/android/net/shared/Inet4AddressUtils.java",
		"core/java/android/net/shared/InetAddressUtils.java",
		"core/java/android/net/util/IpUtils.java",
		"core/java/android/util/LocalLog.java",
		"core/java/com/android/internal/util/Preconditions.java",
		],
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ java_library {
		sdk_version: "module_current",
		libs: [
		"unsupportedappusage",
		"framework-wifi-util-lib",
		],
		static_libs: [
		"dnsresolver_aidl_interface-V2-java",