Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) (115dba27) · Commits · e / os / android_packages_services_Telecomm

Android.bp

+23 −4

Original line number	Diff line number	Diff line
		genrule {
		name: "statslog-telecom-java-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module telecom"
		+ " --javaPackage com.android.server.telecom --javaClass TelecomStatsLog",
		out: ["com/android/server/telecom/TelecomStatsLog.java"],
		}

		filegroup {
		name: "Telecom-srcs",
		srcs: [
		"src/*/.java",
		":statslog-telecom-java-gen",
		],
		}

		// Build the Telecom service.
		android_app {
		name: "Telecom",
		srcs: [
		"src/*/.java",
		":Telecom-srcs",
		"proto/*/.proto",
		],
		resource_dirs: ["res"],
		@@ -25,7 +41,7 @@ android_test {
		static_libs: [
		"android-ex-camera2",
		"guava",
		"mockito-target-inline",
		"mockito-target-extended",
		"androidx.test.rules",
		"platform-test-annotations",
		"androidx.legacy_legacy-support-core-ui",
		@@ -36,7 +52,7 @@ android_test {
		],
		srcs: [
		"tests/src/*/.java",
		"src/*/.java",
		":Telecom-srcs",
		"proto/*/.proto",
		],
		proto: {
		@@ -54,7 +70,10 @@ android_test {
		"android.test.runner",
		],

		jni_libs: ["libdexmakerjvmtiagent"],
		jni_libs: [
		"libdexmakerjvmtiagent",
		"libstaticjvmtiagent",
		],

		aaptflags: [
		"--auto-add-overlay",