Merge "Add dependency on modules-utils-build" (4c851265) · Commits · e / os / android_frameworks_base

wifi/Android.bp

+17 −19

Original line number	Diff line number	Diff line
		@@ -76,25 +76,34 @@ test_access_hidden_api_whitelist = [
		"//packages/apps/Settings/tests/robotests", // TODO(b/161767237): remove
		]

		// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility
		// classes before they are renamed.
		java_library {
		name: "framework-wifi-pre-jarjar",
		// defaults shared between `framework-wifi` & `framework-wifi-pre-jarjar`
		// java_sdk_library `framework-wifi` needs sources to generate stubs, so it cannot reuse
		// `framework-wifi-pre-jarjar`
		java_defaults {
		name: "framework-wifi-defaults",
		defaults: ["wifi-module-sdk-version-defaults"],
		sdk_version: "module_current",
		static_libs: [
		"framework-wifi-util-lib",
		"android.hardware.wifi-V1.0-java-constants",
		"modules-utils-build",
		],
		libs: [
		"framework-annotations-lib",
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		],
		srcs: [
		":framework-wifi-updatable-sources",
		":framework-wifi-util-lib-aidls",
		],
		// java_api_finder must accompany `srcs`
		}

		// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility
		// classes before they are renamed.
		java_library {
		name: "framework-wifi-pre-jarjar",
		defaults: ["framework-wifi-defaults"],
		sdk_version: "module_current",
		libs: ["framework-annotations-lib"],
		// java_api_finder must accompany `srcs` (`srcs` defined in `framework-wifi-defaults`)
		plugins: ["java_api_finder"],
		installable: false,
		visibility: [
		@@ -108,18 +117,7 @@ java_sdk_library {
		name: "framework-wifi",
		defaults: [
		"framework-module-defaults",
		"wifi-module-sdk-version-defaults",
		],
		static_libs: [
		"framework-wifi-util-lib",
		"android.hardware.wifi-V1.0-java-constants",
		],
		libs: [
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		],
		srcs: [
		":framework-wifi-updatable-sources",
		":framework-wifi-util-lib-aidls",
		"framework-wifi-defaults",
		],

		jarjar_rules: ":wifi-jarjar-rules",

wifi/jarjar-rules.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,3 +124,4 @@ rule com.android.internal.util.Preconditions* com.android.wifi.x.@0
		rule com.android.internal.util.Protocol* com.android.wifi.x.@0

		rule com.android.net.module.util.** com.android.wifi.x.@0
		rule com.android.modules.utils.** com.android.wifi.x.@0

wifi/tests/Android.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -31,10 +31,11 @@ android_test {
		static_libs: [
		"androidx.test.rules",
		"core-test-rules",
		"frameworks-base-testutils",
		"guava",
		"mockito-target-minus-junit4",
		"modules-utils-build",
		"net-tests-utils",
		"frameworks-base-testutils",
		"truth-prebuilt",
		],

		@@ -47,4 +48,8 @@ android_test {
		"device-tests",
		"mts",
		],

		// static libs used by both framework-wifi & FrameworksWifiApiTests. Need to rename test usage
		// to a different package name to prevent conflict with the copy in production code.
		jarjar_rules: "test-jarjar-rules.txt",
		}

wifi/tests/test-jarjar-rules.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		rule com.android.modules.utils.** com.android.wifi.test.x.@0