commit 0bce0c6bc7dfa58639433d0781d311217e8bb6ac
author Jeff Hamilton <jham@google.com> Wed Mar 06 22:23:40 2019 -0500
committer Jeff Hamilton <jham@google.com> Thu Mar 07 04:06:07 2019 +0000
tree 8698e3d49a9b4a7e269498837b096bdc36642c72
parent 943c94e7fd0ee0246652bf8225d5db8f795dbb43

Add manifests for media and media.swcodec APEXs

Set the minSdk and targetSdk to 28 for Play ingestion.

Bug: 127713324
Change-Id: Ifa0ea6f3e055dc3d244879f5bd54441932cee631

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 9455290..f182856 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -42,6 +42,9 @@
     },
     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 @@
     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 @@
     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 {