diff options
| author | 2022-01-25 16:13:29 +0000 | |
|---|---|---|
| committer | 2022-01-28 08:47:13 +0000 | |
| commit | a114f9899cc4b53773c8abd17e62fd73ba2cc50f (patch) | |
| tree | 6455c50135e2fb378a72eabf737ce066012b50c5 | |
| parent | 36a4915c86ae1dcbb9983db281306f98c3fea6b4 (diff) | |
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
| -rw-r--r-- | api/api.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/api/api.go b/api/api.go index aa9e399e7272..50db83e60a36 100644 --- a/api/api.go +++ b/api/api.go @@ -149,8 +149,6 @@ func createMergedStubsSrcjar(ctx android.LoadHookContext, modules []string) { // 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"} |