Merge "Add logging class & logging calls for MediaRouter2" into main (7a0f20e2) · Commits · e / os / android_frameworks_base

services/core/Android.bp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,13 @@ genrule {
	out: ["com/android/server/location/contexthub/ContextHubStatsLog.java"],		out: ["com/android/server/location/contexthub/ContextHubStatsLog.java"],
	}		}

			genrule {
			name: "statslog-mediarouter-java-gen",
			tools: ["stats-log-api-gen"],
			cmd: "$(location stats-log-api-gen) --java $(out) --module mediarouter --javaPackage com.android.server.media --javaClass MediaRouterStatsLog",
			out: ["com/android/server/media/MediaRouterStatsLog.java"],
			}

	java_library_static {		java_library_static {
	name: "services.core.unboosted",		name: "services.core.unboosted",
	defaults: [		defaults: [
	@@ -136,6 +143,7 @@ java_library_static {
	":android.hardware.tv.mediaquality-V1-java-source",		":android.hardware.tv.mediaquality-V1-java-source",
	":statslog-art-java-gen",		":statslog-art-java-gen",
	":statslog-contexthub-java-gen",		":statslog-contexthub-java-gen",
			":statslog-mediarouter-java-gen",
	":services.core-aidl-sources",		":services.core-aidl-sources",
	":services.core-sources",		":services.core-sources",
	":services.core.protologsrc",		":services.core.protologsrc",

+128 −36

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+219 −0

File added.

Preview size limit exceeded, changes collapsed.

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,10 @@ package {

	android_test {		android_test {
	name: "MediaRouterServiceTests",		name: "MediaRouterServiceTests",
			defaults: [
			// For ExtendedMockito dependencies.
			"modules-utils-testable-device-config-defaults",
			],
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	],		],
	@@ -23,12 +27,17 @@ android_test {
	"services.core",		"services.core",
	"truth",		"truth",
	],		],
			libs: [
			"android.test.base.stubs",
			"android.test.runner.stubs",
			],

	platform_apis: true,		platform_apis: true,

	test_suites: [		test_suites: [
	// "device-tests",		// "device-tests",
	"general-tests",		"general-tests",
			"mts-statsd",
	],		],

	certificate: "platform",		certificate: "platform",
	@@ -36,4 +45,5 @@ android_test {
	optimize: {		optimize: {
	enabled: false,		enabled: false,
	},		},
			min_sdk_version: "30",
	}		}

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	<option name="test-tag" value="MediaRouterServiceTests" />		<option name="test-tag" value="MediaRouterServiceTests" />
	<option name="test-suite-tag" value="apct" />		<option name="test-suite-tag" value="apct" />
	<option name="test-suite-tag" value="apct-instrumentation" />		<option name="test-suite-tag" value="apct-instrumentation" />
			<option name="test-suite-tag" value="mts" />

	<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>		<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

	@@ -26,7 +27,7 @@
	<option name="install-arg" value="-t" />		<option name="install-arg" value="-t" />
	</target_preparer>		</target_preparer>

	<test class="com.android.tradefed.testtype.InstrumentationTest" >		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
	<option name="package" value="com.android.server.media.tests" />		<option name="package" value="com.android.server.media.tests" />
	<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />		<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
	<option name="hidden-api-checks" value="false"/>		<option name="hidden-api-checks" value="false"/>