Merge "Do not apply jarjar rules on intermediate libs" (fcc10244) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,7 @@ filegroup {
		visibility: [
		"//packages/modules/NetworkStack/tests/unit",
		"//packages/modules/NetworkStack/tests/integration",
		"//packages/modules/Connectivity/tests:__subpackages__",
		"//packages/modules/Connectivity/Tethering/tests/integration",
		]
		}

+4 −16

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ java_defaults {
		"android.test.base",
		"android.test.mock",
		],
		jarjar_rules: ":NetworkStackJarJarRules",
		visibility: ["//visibility:private"],
		}

		@@ -73,6 +72,7 @@ android_test {
		test_suites: ["device-tests"],
		min_sdk_version: "29",
		target_sdk_version: "30",
		jarjar_rules: ":NetworkStackJarJarRules",
		}

		// Network stack next integration tests.
		@@ -88,21 +88,7 @@ android_test {
		certificate: "networkstack",
		platform_apis: true,
		test_suites: ["device-tests"],
		}

		// The static lib needs to be jarjared by each module so they do not conflict with each other
		// (e.g. wifi, system server, network stack need to use different package names when including it).
		// Apply NetworkStack jarjar rules to the tests as well so classes in NetworkStaticLibTests have the
		// same package names as in module code.
		android_library {
		name: "NetworkStackStaticLibTestsLib",
		platform_apis: true,
		min_sdk_version: "29",
		jarjar_rules: ":NetworkStackJarJarRules",
		static_libs: [
		"NetworkStaticLibTestsLib",
		"NetdStaticLibTestsLib",
		],
		}

		// Special version of the network stack tests that includes all tests necessary for code coverage
		@@ -120,8 +106,10 @@ android_test {
		"modules-utils-native-coverage-listener",
		"NetworkStackTestsLib",
		"NetworkStackIntegrationTestsLib",
		"NetworkStackStaticLibTestsLib",
		"NetworkStaticLibTestsLib",
		"NetdStaticLibTestsLib",
		],
		compile_multilib: "both",
		manifest: "AndroidManifest_coverage.xml",
		jarjar_rules: ":NetworkStackJarJarRules",
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ java_defaults {
		"libnetworkstackutilsjni",
		],
		jni_uses_sdk_apis: true,
		jarjar_rules: ":NetworkStackJarJarRules",
		}

		// Tests for NetworkStackNext.
		@@ -58,6 +57,7 @@ android_test {
		defaults: ["NetworkStackTestsDefaults"],
		static_libs: ["NetworkStackApiCurrentLib"],
		compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
		jarjar_rules: ":NetworkStackJarJarRules",
		}

		// Library containing the unit tests. This is used by the coverage test target to pull in the
		@@ -84,6 +84,7 @@ android_test {
		defaults: ["NetworkStackTestsDefaults"],
		static_libs: ["NetworkStackApiStableLib"],
		compile_multilib: "both",
		jarjar_rules: ":NetworkStackJarJarRules",
		}

		// Additional dependencies of libnetworkstackutilsjni that are not provided by the system when