diff options
| -rw-r--r-- | apex/Android.bp | 16 | ||||
| -rw-r--r-- | apex/AndroidManifest-media.xml | 25 | ||||
| -rw-r--r-- | apex/AndroidManifest-swcodec.xml | 25 |
3 files changed, 66 insertions, 0 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index 9455290e4e..f1828569f4 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -42,6 +42,9 @@ apex_defaults { }, 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 { @@ -50,6 +53,16 @@ apex { 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", native_shared_libs: [ @@ -58,6 +71,9 @@ apex_defaults { 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", } apex { diff --git a/apex/AndroidManifest-media.xml b/apex/AndroidManifest-media.xml new file mode 100644 index 0000000000..17d3f3ab55 --- /dev/null +++ b/apex/AndroidManifest-media.xml @@ -0,0 +1,25 @@ +<?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" /> + <uses-sdk + android:minSdkVersion="28" + android:targetSdkVersion="28" + /> +</manifest> diff --git a/apex/AndroidManifest-swcodec.xml b/apex/AndroidManifest-swcodec.xml new file mode 100644 index 0000000000..bd20dc0b8d --- /dev/null +++ b/apex/AndroidManifest-swcodec.xml @@ -0,0 +1,25 @@ +<?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" /> + <uses-sdk + android:minSdkVersion="28" + android:targetSdkVersion="28" + /> +</manifest> |