Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a114f989 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent 36a4915c

api/api.go

+0 −2
Original line number Diff line number Diff line
@@ -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"}