Merge "Move media/apex to apex/media" (6a723fb7) · Commits · e / os / android_frameworks_base

Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -284,6 +284,7 @@ java_defaults {
	name: "framework-aidl-export-defaults",		name: "framework-aidl-export-defaults",
	aidl: {		aidl: {
	export_include_dirs: [		export_include_dirs: [
			"apex/media/java",
	"core/java",		"core/java",
	"drm/java",		"drm/java",
	"graphics/java",		"graphics/java",
	@@ -291,7 +292,6 @@ java_defaults {
	"location/java",		"location/java",
	"lowpan/java",		"lowpan/java",
	"media/java",		"media/java",
	"media/apex/java",
	"media/mca/effect/java",		"media/mca/effect/java",
	"media/mca/filterfw/java",		"media/mca/filterfw/java",
	"media/mca/filterpacks/java",		"media/mca/filterpacks/java",

apex/media/Android.bp

0 → 100644

+120 −0

Original line number	Original line	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.

			java_library {
			name: "updatable-media",

			srcs: [
			":updatable-media-srcs",
			],

			aidl: {
			export_include_dirs: [
			"java",
			],

			// It would be great if we don't need to add include_dirs for public
			// parcelable classes. Find a better way.
			include_dirs: [
			// To refer:
			// android.os.Bundle
			// android.os.ResultReceiver
			"frameworks/base/core/java",
			],
			},

			permitted_packages: [
			"android.media",
			],

			installable: true,

			// TODO: build against stable API surface. Use core_platform for now to avoid
			// link-check failure with exoplayer building against "current".
			sdk_version: "core_platform",
			libs: [
			// The order matters. android_system_* library should come later.
			"framework_media_annotation",
			"android_system_stubs_current",
			],

			static_libs: [
			"exoplayer2-core"
			],
			jarjar_rules: "jarjar_rules.txt",

			plugins: ["java_api_finder"],
			}

			filegroup {
			name: "updatable-media-srcs",
			srcs: [
			":mediaparser-srcs",
			":mediasession2-srcs",
			],
			}

			filegroup {
			name: "mediasession2-srcs",
			srcs: [
			"java/android/media/Controller2Link.java",
			"java/android/media/IMediaController2.aidl",
			"java/android/media/IMediaSession2.aidl",
			"java/android/media/IMediaSession2Service.aidl",
			"java/android/media/MediaConstants.java",
			"java/android/media/MediaController2.java",
			"java/android/media/MediaSession2.java",
			"java/android/media/MediaSession2Service.java",
			"java/android/media/Session2Command.java",
			"java/android/media/Session2CommandGroup.java",
			"java/android/media/Session2Link.java",
			"java/android/media/Session2Token.java",
			],
			path: "java",
			}

			filegroup {
			name: "mediaparser-srcs",
			srcs: [
			"java/android/media/MediaParser.java"
			],
			path: "java"
			}

			droidstubs {
			name: "updatable-media-stubs",
			srcs: [
			":updatable-media-srcs",
			":framework-media-annotation-srcs",
			],
			defaults: [ "framework-module-stubs-defaults-systemapi" ],
			aidl: {
			// TODO(b/135922046) remove this
			include_dirs: ["frameworks/base/core/java"],
			},
			sdk_version: "system_current",
			}

			java_library {
			name: "updatable_media_stubs",
			srcs: [":updatable-media-stubs"],
			sdk_version: "system_current",
			}

			java_library {
			name: "framework_media_annotation",
			srcs: [":framework-media-annotation-srcs"],
			installable: false,
			sdk_version: "core_current",
			}

apex/media/OWNERS

0 → 100644

+4 −0

Original line number	Original line	Diff line number	Diff line
			andrewlewis@google.com
			dwkang@google.com
			marcone@google.com
			sungsoo@google.com

media/jarjar_rules.txt→apex/media/jarjar_rules.txt

+0 −0

File moved.

View file

media/apex/java/android/media/BufferingParams.java→apex/media/java/android/media/BufferingParams.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -16,13 +16,9 @@

	package android.media;		package android.media;

	import android.annotation.IntDef;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;

	import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;

	/**		/**
	* Structure for source buffering management params.		* Structure for source buffering management params.
	*		*