Merge "Add jarjar rules for telephony tests" am: be212f70f0 (c8e3921a) · Commits · e / os / android_frameworks_opt_telephony

tests/telephonytests/Android.bp

+13 −1

Original line number	Diff line number	Diff line
		@@ -26,10 +26,22 @@ android_test {
		],

		platform_apis: true,
		jarjar_rules: ":jarjar-rules-shared",
		jarjar_rules: ":jarjar-rules-telephony-tests",

		test_suites: [
		"mts",
		"device-tests",
		],
		}

		genrule {
		name: "jarjar-rules-telephony-tests",
		srcs: [
		// Order matters: test rules override the base ones
		"jarjar-rules-tests.txt",
		":jarjar-rules-shared",
		],
		out: ["jarjar-rules-telephony-tests-combined.txt"],
		cmd: "cat $(in) > $(out)",
		visibility: ["//visibility:private"],
		}

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		# NetworkFactory is included in telephony-common and services.net
		# Rename the non-jarjared, services.net version to avoid conflicts.
		# This causes two NetworkFactory classes to appear in the test package (one used
		# by services-net and one by telephony-common), similarly to what happens on a
		# real device, except that in the test they have different package names.
		rule android.net.NetworkFactory* android.net.services.NetworkFactory@1