Merge "Suppress existing CallbackMethodName lint"
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 33d3d47..60f56de 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -79,7 +79,7 @@
"sdk-dir",
"api-versions-jars-dir",
],
- previous_api: ":last-released-public-api",
+ previous_api: ":android.api.public.latest",
merge_annotations_dirs: [
"metalava-manual",
],
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 74b0524..097fb74 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -54,7 +54,7 @@
libs: ["framework-internal-utils"],
installable: false,
annotations_enabled: true,
- previous_api: ":last-released-public-api",
+ previous_api: ":android.api.public.latest",
merge_annotations_dirs: [
"metalava-manual",
],
@@ -97,13 +97,13 @@
removed_api_file: "api/removed.txt",
},
last_released: {
- api_file: ":last-released-public-api",
+ api_file: ":android.api.public.latest",
removed_api_file: "api/removed.txt",
baseline_file: ":public-api-incompatibilities-with-last-released",
},
api_lint: {
enabled: true,
- new_since: ":last-released-public-api",
+ new_since: ":android.api.public.latest",
baseline_file: "api/lint-baseline.txt",
},
},
@@ -139,13 +139,13 @@
removed_api_file: "api/system-removed.txt",
},
last_released: {
- api_file: ":last-released-system-api",
+ api_file: ":android.api.system.latest",
removed_api_file: "api/system-removed.txt",
baseline_file: ":system-api-incompatibilities-with-last-released"
},
api_lint: {
enabled: true,
- new_since: ":last-released-system-api",
+ new_since: ":android.api.system.latest",
baseline_file: "api/system-lint-baseline.txt",
},
},
@@ -207,13 +207,13 @@
removed_api_file: "api/module-lib-removed.txt",
},
last_released: {
- api_file: ":last-released-module-lib-api",
+ api_file: ":android.api.module-lib.latest",
removed_api_file: "api/module-lib-removed.txt",
baseline_file: ":module-lib-api-incompatibilities-with-last-released"
},
api_lint: {
enabled: true,
- new_since: ":last-released-module-lib-api",
+ new_since: ":android.api.module-lib.latest",
baseline_file: "api/module-lib-lint-baseline.txt",
},
},
@@ -314,7 +314,7 @@
installable: false,
sdk_version: "core_platform",
annotations_enabled: true,
- previous_api: ":last-released-public-api",
+ previous_api: ":android.api.public.latest",
merge_annotations_dirs: [
"metalava-manual",
],
diff --git a/apex/sdkextensions/framework/Android.bp b/apex/sdkextensions/framework/Android.bp
index 3eabb88..6a78711 100644
--- a/apex/sdkextensions/framework/Android.bp
+++ b/apex/sdkextensions/framework/Android.bp
@@ -48,6 +48,7 @@
name: "framework-sdkextensions-stubs-defaults",
srcs: [ ":framework-sdkextensions-sources" ],
libs: [ "framework-annotations-lib" ],
+ dist: { dest: "framework-sdkextensions.txt" },
}
droidstubs {
@@ -55,7 +56,7 @@
defaults: [
"framework-module-stubs-defaults-publicapi",
"framework-sdkextensions-stubs-defaults",
- ]
+ ],
}
droidstubs {
@@ -63,7 +64,7 @@
defaults: [
"framework-module-stubs-defaults-systemapi",
"framework-sdkextensions-stubs-defaults",
- ]
+ ],
}
droidstubs {
@@ -71,7 +72,7 @@
defaults: [
"framework-module-api-defaults-module_libs_api",
"framework-sdkextensions-stubs-defaults",
- ]
+ ],
}
droidstubs {
@@ -79,7 +80,7 @@
defaults: [
"framework-module-stubs-defaults-module_libs_api",
"framework-sdkextensions-stubs-defaults",
- ]
+ ],
}
java_library {
@@ -89,7 +90,8 @@
visibility: [
"//frameworks/base", // Framework
"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
- ]
+ ],
+ dist: { dest: "framework-sdkextensions.jar" },
}
java_library {
@@ -99,7 +101,8 @@
visibility: [
"//frameworks/base", // Framework
"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
- ]
+ ],
+ dist: { dest: "framework-sdkextensions.jar" },
}
java_library {
@@ -109,5 +112,6 @@
visibility: [
"//frameworks/base", // Framework
"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
- ]
+ ],
+ dist: { dest: "framework-sdkextensions.jar" },
}
diff --git a/packages/Tethering/common/TetheringLib/Android.bp b/packages/Tethering/common/TetheringLib/Android.bp
index b520bc8..8ae1593 100644
--- a/packages/Tethering/common/TetheringLib/Android.bp
+++ b/packages/Tethering/common/TetheringLib/Android.bp
@@ -67,6 +67,7 @@
stubs_defaults {
name: "framework-tethering-stubs-defaults",
srcs: [":framework-tethering-srcs"],
+ dist: { dest: "framework-tethering.txt" },
}
filegroup {
@@ -123,16 +124,19 @@
name: "framework-tethering-stubs-publicapi",
srcs: [":framework-tethering-stubs-srcs-publicapi"],
defaults: ["framework-module-stubs-lib-defaults-publicapi"],
+ dist: { dest: "framework-tethering.jar" },
}
java_library {
name: "framework-tethering-stubs-systemapi",
srcs: [":framework-tethering-stubs-srcs-systemapi"],
defaults: ["framework-module-stubs-lib-defaults-systemapi"],
+ dist: { dest: "framework-tethering.jar" },
}
java_library {
name: "framework-tethering-stubs-module_libs_api",
srcs: [":framework-tethering-stubs-srcs-module_libs_api"],
defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
+ dist: { dest: "framework-tethering.jar" },
}
diff --git a/services/Android.bp b/services/Android.bp
index b4d83936..0d221b9 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -122,13 +122,13 @@
removed_api_file: "api/removed.txt",
},
last_released: {
- api_file: ":last-released-system-server-api",
+ api_file: ":android.api.system-server.latest",
removed_api_file: "api/removed.txt",
baseline_file: ":system-server-api-incompatibilities-with-last-released"
},
api_lint: {
enabled: true,
- new_since: ":last-released-system-server-api",
+ new_since: ":android.api.system-server.latest",
baseline_file: "api/lint-baseline.txt",
},
},