Merge "Tweak module_libs stub build rules"
This commit is contained in:
@@ -186,7 +186,6 @@ droidstubs {
|
|||||||
droidstubs {
|
droidstubs {
|
||||||
name: "module-lib-api",
|
name: "module-lib-api",
|
||||||
defaults: ["metalava-api-stubs-default"],
|
defaults: ["metalava-api-stubs-default"],
|
||||||
libs: ["framework-all"],
|
|
||||||
arg_files: ["core/res/AndroidManifest.xml"],
|
arg_files: ["core/res/AndroidManifest.xml"],
|
||||||
args: metalava_framework_docs_args + module_libs,
|
args: metalava_framework_docs_args + module_libs,
|
||||||
check_api: {
|
check_api: {
|
||||||
@@ -218,7 +217,6 @@ droidstubs {
|
|||||||
droidstubs {
|
droidstubs {
|
||||||
name: "module-lib-api-stubs-docs",
|
name: "module-lib-api-stubs-docs",
|
||||||
defaults: ["metalava-api-stubs-default"],
|
defaults: ["metalava-api-stubs-default"],
|
||||||
libs: ["framework-all"],
|
|
||||||
arg_files: ["core/res/AndroidManifest.xml"],
|
arg_files: ["core/res/AndroidManifest.xml"],
|
||||||
args: metalava_framework_docs_args + priv_apps + module_libs,
|
args: metalava_framework_docs_args + priv_apps + module_libs,
|
||||||
}
|
}
|
||||||
@@ -295,12 +293,12 @@ java_library_static {
|
|||||||
],
|
],
|
||||||
libs: [
|
libs: [
|
||||||
"stub-annotations",
|
"stub-annotations",
|
||||||
"framework-all",
|
|
||||||
],
|
],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"private-stub-annotations-jar",
|
"private-stub-annotations-jar",
|
||||||
],
|
],
|
||||||
defaults: ["framework-stubs-default"],
|
defaults: ["framework-stubs-default"],
|
||||||
|
sdk_version: "core_current",
|
||||||
}
|
}
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////
|
||||||
|
|||||||
Reference in New Issue
Block a user