Merge "Remove apex/media - migrated to packages/modules/Media" (fba1cbe1) · Commits · e / os / android_frameworks_base

Android.bp

+3 −4

Original line number	Diff line number	Diff line
		@@ -191,7 +191,6 @@ java_defaults {
		"sax/java",
		"telecomm/java",

		"apex/media/aidl/stable",
		// TODO(b/147699819): remove this
		"telephony/java",
		],
		@@ -289,6 +288,7 @@ java_defaults {
		// TODO: remove when moved to the below package
		"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		"hardware/interfaces/graphics/common/aidl",
		],
		},
		@@ -538,6 +538,7 @@ stubs_defaults {
		"frameworks/native/libs/permission/aidl",
		// TODO: remove when moved to the below package
		"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		"packages/modules/Connectivity/framework/aidl-export",
		"hardware/interfaces/graphics/common/aidl",
		],
		@@ -575,11 +576,9 @@ stubs_defaults {
		stubs_defaults {
		name: "module-classpath-stubs-defaults",
		aidl: {
		local_include_dirs: [
		"apex/media/aidl/stable",
		],
		include_dirs: [
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		],
		},
		libs: [

+1 −3

Original line number	Diff line number	Diff line
		@@ -145,11 +145,9 @@ droidstubs {
		"api-versions-jars-dir",
		],
		aidl: {
		local_include_dirs: [
		"apex/media/aidl/stable",
		],
		include_dirs: [
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		],
		},
		}

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		// Copyright (C) 2020 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.
		package {
		default_visibility: [
		":__subpackages__",
		"//frameworks/av/apex",
		"//frameworks/av/apex/testing",
		],
		// See: http://go/android-license-faq
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		sdk {
		name: "media-module-sdk",
		bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],
		systemserverclasspath_fragments: ["com.android.media-systemserverclasspath-fragment"],
		java_sdk_libs: [
		"framework-media",
		],
		}

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		# Bug component: 1344
		hdmoon@google.com
		jinpark@google.com
		klhyun@google.com
		lnilsson@google.com
		sungsoo@google.com

		# go/android-fwk-media-solutions for info on areas of ownership.
		include platform/frameworks/av:/media/janitors/media_solutions_OWNERS

		# media reliability team packages/delivers the media mainline builds.
		include platform/frameworks/av:/media/janitors/reliability_mainline_OWNERS

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		//
		// Copyright 2020 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.
		//

		package {
		// See: http://go/android-license-faq
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		filegroup {
		name: "stable-media-aidl-srcs",
		srcs: ["stable/*/.aidl"],
		path: "stable",
		}

		filegroup {
		name: "private-media-aidl-srcs",
		srcs: ["private/*/I.aidl"],
		path: "private",
		}

		filegroup {
		name: "media-aidl-srcs",
		srcs: [
		":private-media-aidl-srcs",
		":stable-media-aidl-srcs",
		],
		}