Snap for 11302939 from 2b01477d6b30da3a6d6e02530d7f3c9b48c08531 to 24Q2-release (bd17c80f) · Commits · e / os / android_packages_services_Telecomm

Android.bp

+20 −28

Original line number	Diff line number	Diff line
		@@ -10,19 +10,12 @@ genrule {
		out: ["com/android/server/telecom/TelecomStatsLog.java"],
		}

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

		// Build the Telecom service.
		android_app {
		name: "Telecom",
		srcs: [
		":Telecom-srcs",
		"proto/*/.proto",
		],
		static_libs: [
		@@ -30,9 +23,6 @@ android_app {
		"androidx.core_core",
		"telecom_flags_core_java_lib",
		],
		libs: [
		"services",
		],
		resource_dirs: ["res"],
		proto: {
		type: "nano",
		@@ -40,6 +30,22 @@ android_app {
		output_params: ["optional_field_style=accessors"],
		},
		platform_apis: true,
		}


		// Build the Telecom service.
		android_app {
		name: "Telecom",
		srcs: [
		],
		static_libs: [
		"TelecomLib",
		],
		libs: [
		"services",
		],
		resource_dirs: [],
		platform_apis: true,
		certificate: "platform",
		privileged: true,
		optimize: {
		@@ -50,6 +56,7 @@ android_app {
		android_test {
		name: "TelecomUnitTests",
		static_libs: [
		"TelecomLib",
		"android-ex-camera2",
		"flag-junit",
		"guava",
		@@ -58,25 +65,15 @@ android_test {
		"platform-test-annotations",
		"androidx.legacy_legacy-support-core-ui",
		"androidx.legacy_legacy-support-core-utils",
		"androidx.core_core",
		"androidx.fragment_fragment",
		"androidx.test.ext.junit",
		"platform-compat-test-rules",
		"telecom_flags_core_java_lib",
		],
		srcs: [
		"tests/src/*/.java",
		":Telecom-srcs",
		"proto/*/.proto",
		],
		proto: {
		type: "nano",
		local_include_dirs: ["proto/"],
		output_params: ["optional_field_style=accessors"],
		},
		resource_dirs: [
		"tests/res",
		"res",
		],
		libs: [
		"android.test.mock",
		@@ -89,11 +86,6 @@ android_test {
		"libstaticjvmtiagent",
		],

		aaptflags: [
		"--auto-add-overlay",
		"--extra-packages",
		"com.android.server.telecom",
		],
		manifest: "tests/AndroidManifest.xml",
		optimize: {
		enabled: false,

AndroidManifestLib.xml

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2024 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<manifest package="com.android.server.telecom">
		</manifest>