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

Commit 2df9bf79 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate more mainline-hosted code into module directory" am: ec5965ba... 

Merge "Migrate more mainline-hosted code into module directory" am: ec5965ba am: e7bbb168 am: a1900087 am: 6c5122e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2212898



Change-Id: I282a99ba4bd265b396f4e54645f4654dd31c9fd9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d61c8cc 6c5122e8

services/mediacodec/registrant/Android.bp→media/module/codecserviceregistrant/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ package { 
    // all of the 'license_kinds' from "frameworks_av_services_mediacodec_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_services_mediacodec_license"],

}



cc_library {

services/mediacodec/registrant/fuzzer/Android.bp→media/module/codecserviceregistrant/fuzzer/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package { 
    // all of the 'license_kinds' from "frameworks_av_services_mediacodec_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_services_mediacodec_license"],

}



cc_fuzz {