Merge annotations zip from conscrypt and i18n
Previously, conscrypt and i18n were excluded from the list of modules
from which combined_apis retrieved annotation zip files as they did not
provide those files. They now provide those files so no longer need to
be treated specially.
Bug: 216435117
Test: m sdk-annotations.zip
Change-Id: I6db85a44715362dfb288ddf9010e2289233acf78
diff --git a/api/api.go b/api/api.go
index aa9e399e..50db83e 100644
--- a/api/api.go
+++ b/api/api.go
@@ -149,8 +149,6 @@
// This produces the same annotations.zip as framework-doc-stubs, but by using
// outputs from individual modules instead of all the source code.
func createMergedAnnotations(ctx android.LoadHookContext, modules []string) {
- // Conscrypt and i18n currently do not enable annotations
- modules = removeAll(modules, []string{conscrypt, i18n})
props := genruleProps{}
props.Name = proptools.StringPtr("sdk-annotations.zip")
props.Tools = []string{"merge_annotation_zips", "soong_zip"}