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

Commit 1ca9bd1c authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Use java_sdk_library for API for updatable-media am: 289a482f

Change-Id: I64c0b8407da881e283849fba5e95f2e5d2b8ae83
parents dd60f361 289a482f
Loading
Loading
Loading
Loading
+15 −82
Original line number Diff line number Diff line
@@ -85,96 +85,29 @@ filegroup {
    path: "java",
}	

stubs_defaults {
    name: "framework-media-stubs-srcs-defaults",
    srcs: [ ":updatable-media-srcs" ],
    libs: [ "framework_media_annotation" ],
    aidl: {
        // TODO(b/135922046) remove this
        include_dirs: ["frameworks/base/core/java"],
    },
    dist: { dest: "framework-media.txt" },
}
java_sdk_library {
    name: "framework-media",
    defaults: ["framework-module-defaults"],

droidstubs {
    name: "framework-media-stubs-srcs-publicapi",
    defaults: [
        "framework-media-stubs-srcs-defaults",
        "framework-module-stubs-defaults-publicapi",
    ],
    check_api: {
        last_released: {
            api_file: ":framework-media.api.public.latest",
            removed_api_file: ":framework-media-removed.api.public.latest",
        },
        api_lint: {
            new_since: ":framework-media.api.public.latest",
        },
    },
}
    // This is only used to define the APIs for updatable-media.
    api_only: true,

droidstubs {
    name: "framework-media-stubs-srcs-systemapi",
    defaults: [
        "framework-media-stubs-srcs-defaults",
        "framework-module-stubs-defaults-systemapi",
    srcs: [
        ":updatable-media-srcs",
    ],
    check_api: {
        last_released: {
            api_file: ":framework-media.api.system.latest",
            removed_api_file: ":framework-media-removed.api.system.latest",
        },
        api_lint: {
            new_since: ":framework-media.api.system.latest",
        },
    },
}

droidstubs {
    name: "framework-media-api-module_libs_api",
    defaults: [
        "framework-media-stubs-srcs-defaults",
        "framework-module-api-defaults-module_libs_api",
    ],
    check_api: {
        last_released: {
            api_file: ":framework-media.api.module-lib.latest",
            removed_api_file: ":framework-media-removed.api.module-lib.latest",
        },
        api_lint: {
            new_since: ":framework-media.api.module-lib.latest",
        },
    },
}
    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
    // modules to java_sdk_library.
    naming_scheme: "framework-modules",

droidstubs {
    name: "framework-media-stubs-srcs-module_libs_api",
    defaults: [
        "framework-media-stubs-srcs-defaults",
        "framework-module-stubs-defaults-module_libs_api",
    libs: [
        "framework_media_annotation",
    ],
}

java_library {
    name: "framework-media-stubs-publicapi",
    srcs: [":framework-media-stubs-srcs-publicapi"],
    defaults: ["framework-module-stubs-lib-defaults-publicapi"],
    dist: { dest: "framework-media.jar" },
}

java_library {
    name: "framework-media-stubs-systemapi",
    srcs: [":framework-media-stubs-srcs-systemapi"],
    defaults: ["framework-module-stubs-lib-defaults-systemapi"],
    dist: { dest: "framework-media.jar" },
    visibility: ["//frameworks/av/apex:__subpackages__"],
}

java_library {
    name: "framework-media-stubs-module_libs_api",
    srcs: [":framework-media-stubs-srcs-module_libs_api"],
    defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
    dist: { dest: "framework-media.jar" },
}

java_library {
    name: "framework_media_annotation",