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

Commit 25a785e3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33706950'] into 25Q2-release.

Change-Id: I3215df8c0b8b9733db1941bbe15d6ff4159f99ce
parents 4b211188 d1b598e2
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ apex {
    manifest: "manifest.json",
    defaults: ["com.android.media-defaults"],
    prebuilts: ["current_sdkinfo"],
    licenses: [
        "frameworks_av_license",
        "opensourcerequest",
    ],
}

linker_config {
@@ -250,6 +254,10 @@ apex {
    name: "com.android.media.swcodec",
    manifest: "manifest_codec.json",
    defaults: ["com.android.media.swcodec-defaults"],
    licenses: [
        "frameworks_av_license",
        "opensourcerequest",
    ],
}

apex_key {