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

Commit 8f618574 authored by Baligh Uddin's avatar Baligh Uddin Committed by Automerger Merge Worker
Browse files

Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3... 

Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3 am: 5d27eda9 am: 1797a762

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168

Change-Id: I99c86dcc99d61a059cd4475f0d737ad5d0b5b3f5
parents 6f0012af 1797a762

apex/media/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -18,11 +18,7 @@ package { 
        "//frameworks/av/apex/testing",

    ],

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



sdk {

apex/media/aidl/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -16,11 +16,7 @@ 


package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

apex/media/framework/Android.bp

+2 −5
Original line number Diff line number Diff line
@@ -14,11 +14,7 @@ 


package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



java_library {
@@ -68,6 +64,7 @@ java_library { 
        "//frameworks/av/apex:__subpackages__",

        "//frameworks/base/apex/media/service",

        "//frameworks/base/api", // For framework-all

        "//packages/modules/Media/apex/service",

    ],

}

apex/media/service/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -13,11 +13,7 @@ 
// limitations under the License.

package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

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

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {