Use java_sdk_library for API for updatable-media

The API for the updatable-media library is prefixed with
framework-media so it cannot be switched to use java_sdk_library
directly. Instead a new API only java_sdk_library was added for
framework-media.

The names of the individual modules do not quite follow the pattern
that java_sdk_library uses so this temporarily sets the following:
    naming_scheme: "frameworks-modules"

That causes java_sdk_library to use a naming scheme that matches the
one used by the individual modules of this. It will be cleaned up
later.

Test: m update-api
Bug: 155164730
Change-Id: Ib9dd6d276856146e161578697cc6ba83b26e4ad8
This commit is contained in:
Paul Duffin
2020-05-13 18:04:10 +01:00
parent efbfbe08cb
commit 289a482fea

View File

@@ -85,96 +85,29 @@ filegroup {
path: "java", path: "java",
} }
stubs_defaults { java_sdk_library {
name: "framework-media-stubs-srcs-defaults", name: "framework-media",
srcs: [ ":updatable-media-srcs" ], defaults: ["framework-module-defaults"],
libs: [ "framework_media_annotation" ],
aidl: {
// TODO(b/135922046) remove this
include_dirs: ["frameworks/base/core/java"],
},
dist: { dest: "framework-media.txt" },
}
droidstubs { // This is only used to define the APIs for updatable-media.
name: "framework-media-stubs-srcs-publicapi", api_only: true,
defaults: [
"framework-media-stubs-srcs-defaults", srcs: [
"framework-module-stubs-defaults-publicapi", ":updatable-media-srcs",
], ],
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",
},
},
}
droidstubs { // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
name: "framework-media-stubs-srcs-systemapi", // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
defaults: [ // modules to java_sdk_library.
"framework-media-stubs-srcs-defaults", naming_scheme: "framework-modules",
"framework-module-stubs-defaults-systemapi",
libs: [
"framework_media_annotation",
], ],
check_api: {
last_released: { visibility: ["//frameworks/av/apex:__subpackages__"],
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",
},
},
}
droidstubs {
name: "framework-media-stubs-srcs-module_libs_api",
defaults: [
"framework-media-stubs-srcs-defaults",
"framework-module-stubs-defaults-module_libs_api",
],
}
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" },
}
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 { java_library {
name: "framework_media_annotation", name: "framework_media_annotation",