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

Commit 6c5122e8 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

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



Change-Id: Ie773f9104ee7e55999f3f790360772e67f584768
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51302dc9 a1900087

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

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

    // all of the 'license_kinds' from "frameworks_av_services_mediacodec_license"

    // to get the below license kinds:

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_services_mediacodec_license"],

}

}





cc_library {

cc_library {

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

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

    // all of the 'license_kinds' from "frameworks_av_services_mediacodec_license"

    // to get the below license kinds:

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_av_services_mediacodec_license"],

}

}





cc_fuzz {

cc_fuzz {