Merge "DO NOT MERGE - Merge Android 10 into master" (1210f45e) · Commits · e / os / android_frameworks_av

Android.bp

deleted100644 → 0

+0 −7

Original line number	Diff line number	Diff line
		subdirs = [
		"camera",
		"drm/*",
		"media/*",
		"services/*",
		"soundtrigger",
		]

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmediacodecservice.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_xmlparser@1.0.so)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_soft_*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/libstagefright_soft_*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicyengineconfig*)

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

apex/Android.bp

+96 −15

Original line number	Diff line number	Diff line
		@@ -12,9 +12,12 @@
		// 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"],
		multilib: {
		first: {
		// Extractor process runs only with the primary ABI.
		native_shared_libs: [
		// Extractor plugins
		"libaacextractor",
		@@ -27,10 +30,72 @@ apex {
		"libmpeg2extractor",
		"liboggextractor",
		"libwavextractor",
		// MediaPlayer2
		"libmedia2_jni",
		],
		},
		},
		prebuilts: [
		"mediaextractor.policy",
		],
		key: "com.android.media.key",
		certificate: ":com.android.media.certificate",

		// Use a custom AndroidManifest.xml used for API targeting.
		androidManifest: ":com.android.media-androidManifest",
		}

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

		filegroup {
		name: "com.android.media-androidManifest",
		srcs: ["AndroidManifest-media.xml"],
		}

		filegroup {
		name: "com.android.media.swcodec-androidManifest",
		srcs: ["AndroidManifest-swcodec.xml"],
		}

		apex_defaults {
		name: "com.android.media.swcodec-defaults",
		binaries: [
		"mediaswcodec",
		],
		prebuilts: [
		"com.android.media.swcodec-mediaswcodec.rc",
		"com.android.media.swcodec-ld.config.txt",
		"mediaswcodec.policy",
		"mediaswcodec.xml",
		],
		use_vendor: true,
		key: "com.android.media.swcodec.key",
		certificate: ":com.android.media.swcodec.certificate",

		// Use a custom AndroidManifest.xml used for API targeting.
		androidManifest: ":com.android.media.swcodec-androidManifest",
		}

		prebuilt_etc {
		name: "com.android.media.swcodec-mediaswcodec.rc",
		src: "mediaswcodec.rc",
		filename: "init.rc",
		installable: false,
		}

		prebuilt_etc {
		name: "com.android.media.swcodec-ld.config.txt",
		src: "ld.config.txt",
		filename: "ld.config.txt",
		installable: false,
		}

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

		apex_key {
		@@ -38,3 +103,19 @@ apex_key {
		public_key: "com.android.media.avbpubkey",
		private_key: "com.android.media.pem",
		}

		apex_key {
		name: "com.android.media.swcodec.key",
		public_key: "com.android.media.swcodec.avbpubkey",
		private_key: "com.android.media.swcodec.pem",
		}

		android_app_certificate {
		name: "com.android.media.certificate",
		certificate: "com.android.media",
		}

		android_app_certificate {
		name: "com.android.media.swcodec.certificate",
		certificate: "com.android.media.swcodec",
		}

apex/AndroidManifest-media.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (C) 2017 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 xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.media">
		<!-- APEX does not have classes.dex -->
		<application android:hasCode="false" />
		<!-- Setting maxSdk to lock the module to Q. minSdk is auto-set by build system -->
		<uses-sdk
		android:maxSdkVersion="29"
		android:targetSdkVersion="29"
		/>
		</manifest>

apex/AndroidManifest-swcodec.xml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		* Copyright (C) 2017 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 xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.media.swcodec">
		<!-- APEX does not have classes.dex -->
		<application android:hasCode="false" />
		<!-- Setting maxSdk to lock the module to Q. minSdk is auto-set by build system -->
		<uses-sdk
		android:maxSdkVersion="29"
		android:targetSdkVersion="29"
		/>
		</manifest>