Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bce0c6b authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

Add manifests for media and media.swcodec APEXs 

Set the minSdk and targetSdk to 28 for Play ingestion.

Bug: 127713324
Change-Id: Ifa0ea6f3e055dc3d244879f5bd54441932cee631
parent 943c94e7

apex/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -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 {

apex/AndroidManifest-media.xml

0 → 100644
+25 −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" />

  <uses-sdk

      android:minSdkVersion="28"

      android:targetSdkVersion="28"

  />

</manifest>

apex/AndroidManifest-swcodec.xml

0 → 100644
+25 −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" />

  <uses-sdk

      android:minSdkVersion="28"

      android:targetSdkVersion="28"

  />

</manifest>