Merge "Add test_com.android.media[.swcodec]" (cbae1d43) · Commits · e / os / android_frameworks_av

apex/Android.bp

+15 −5

Original line number	Diff line number	Diff line
		@@ -12,9 +12,8 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		apex {
		name: "com.android.media",
		manifest: "manifest.json",
		apex_defaults {
		name: "com.android.media-defaults",
		java_libs: ["updatable-media"],
		compile_multilib: "both",
		multilib: {
		@@ -45,8 +44,13 @@ apex {
		}

		apex {
		name: "com.android.media.swcodec",
		manifest: "manifest_codec.json",
		name: "com.android.media",
		manifest: "manifest.json",
		defaults: ["com.android.media-defaults"],
		}

		apex_defaults {
		name: "com.android.media.swcodec-defaults",
		native_shared_libs: [
		"libmedia_codecserviceregistrant",
		],
		@@ -54,6 +58,12 @@ apex {
		key: "com.android.media.swcodec.key",
		}

		apex {
		name: "com.android.media.swcodec",
		manifest: "manifest_codec.json",
		defaults: ["com.android.media.swcodec-defaults"],
		}

		apex_key {
		name: "com.android.media.key",
		public_key: "com.android.media.avbpubkey",

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2018 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.

		apex {
		name: "test_com.android.media",
		manifest: "test_manifest.json",
		file_contexts: "com.android.media",
		defaults: ["com.android.media-defaults"],
		installable: false,
		}

		apex {
		name: "test_com.android.media.swcodec",
		manifest: "test_manifest_codec.json",
		file_contexts: "com.android.media.swcodec",
		defaults: ["com.android.media.swcodec-defaults"],
		installable: false,
		}

0 → 100644

+4 −0

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media.swcodec",
		"version": 2
		}