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

Commit 85231d53 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Build updatable media against the module SDK"

parents 12a44617 2ce92a9d
Loading
Loading
Loading
Loading
+1 −20
Original line number Diff line number Diff line
@@ -19,21 +19,6 @@ java_library {
        ":updatable-media-srcs",
    ],

    aidl: {
        export_include_dirs: [
            "java",
        ],

        // It would be great if we don't need to add include_dirs for public
        // parcelable classes. Find a better way.
        include_dirs: [
            // To refer:
            // android.os.Bundle
            // android.os.ResultReceiver
            "frameworks/base/core/java",
        ],
    },

    permitted_packages: [
        "android.media",
    ],
@@ -46,13 +31,9 @@ java_library {

    installable: true,

    // TODO: build against stable API surface. Use core_platform for now to avoid
    // link-check failure with exoplayer building against "current".
    sdk_version: "core_platform",
    sdk_version: "module_current",
    libs: [
        // The order matters. android_system_* library should come later.
        "framework_media_annotation",
        "android_system_stubs_current",
    ],

    static_libs: [