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

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

Merge "Remove apex/media - migrated to packages/modules/Media" am: 8aa8ce4f am: 15d4890f 

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

Change-Id: I55d97c0a74a528ee6950f68c7c04f0cee82461e0
parents d0498033 15d4890f

Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ java_defaults { 
            "sax/java",

            "telecomm/java",



            "apex/media/aidl/stable",

            // TODO(b/147699819): remove this

            "telephony/java",

        ],
@@ -275,6 +274,7 @@ java_defaults { 
            // TODO: remove when moved to the below package

            "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

        ],

    },

    dxflags: [
@@ -552,11 +552,9 @@ stubs_defaults { 
stubs_defaults {

    name: "module-classpath-stubs-defaults",

    aidl: {

        local_include_dirs: [

            "apex/media/aidl/stable",

        ],

        include_dirs: [

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

        ],

    },

    libs: [

ApiDocs.bp

+1 −3
Original line number Diff line number Diff line
@@ -140,11 +140,9 @@ droidstubs { 
        "api-versions-jars-dir",

    ],

    aidl: {

        local_include_dirs: [

            "apex/media/aidl/stable",

        ],

        include_dirs: [

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

        ],

    },

}

apex/media/Android.bp

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
// Copyright (C) 2020 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.

package {

    default_visibility: [

        ":__subpackages__",

        "//frameworks/av/apex",

        "//frameworks/av/apex/testing",

    ],

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

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

}



sdk {

    name: "media-module-sdk",

    bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"],

    systemserverclasspath_fragments: ["com.android.media-systemserverclasspath-fragment"],

    java_sdk_libs: [

        "framework-media",

    ],

}

apex/media/OWNERS

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
# Bug component: 1344

hdmoon@google.com

jinpark@google.com

klhyun@google.com

lnilsson@google.com

sungsoo@google.com



# go/android-fwk-media-solutions for info on areas of ownership.

include platform/frameworks/av:/media/janitors/media_solutions_OWNERS



# media reliability team packages/delivers the media mainline builds.

include platform/frameworks/av:/media/janitors/reliability_mainline_OWNERS

apex/media/aidl/Android.bp

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
//

// Copyright 2020 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.

//



package {

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

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

}



filegroup {

    name: "stable-media-aidl-srcs",

    srcs: ["stable/**/*.aidl"],

    path: "stable",

}



filegroup {

    name: "private-media-aidl-srcs",

    srcs: ["private/**/I*.aidl"],

    path: "private",

}



filegroup {

    name: "media-aidl-srcs",

    srcs: [

        ":private-media-aidl-srcs",

        ":stable-media-aidl-srcs",

    ],

}