Make core.current.stubs a proper subset of android.jar
Previously, this was built against a different set of classes than
the core library contributed to the android.jar and so there were some
differences.
1) Some com.android.org.conscrypt annotation classes were accidentally
exposed due to a bug in the currysrc code that meant it did not
process annotations.
2) The android.net.ssl classes provided by conscrypt were not present
because that are in a separate conscrypt_public_api_files filegroup
which was not supplied to droidstubs
Test: m checkbuild and check stubs output
Change-Id: If41a101c8dc5ccd9ec9fe336cc0108401fb693c0
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 12abaf1..7a939cc 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -803,13 +803,12 @@
// Only for use by core.current.stubs target below.
droidstubs {
name: "core-current-stubs-gen",
- srcs: [":core_api_files"],
+ srcs: [
+ ":core_public_api_files",
+ ],
java_version: "1.9",
installable: false,
sdk_version: "none",
- args: " --exclude-annotations " +
- "--hide-annotation libcore.api.Hide",
- merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"],
}
// A stubs target containing the parts of the public SDK API provided by the