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

Commit b3cbd618 authored by Anton Hansson's avatar Anton Hansson
Browse files

Make hiddenapi flag generation use new artifact 

Use the output of new genrule combined-removed-dex instead of the
removedDexApi output from various metalava runs when generating the
hiddenapi-flags.csv file.

There are some minor difference in the two combined-removed-dex files,
but these diffs do not amount to any diffs in the generated
hiddenapi-flags.csv file. See the full set of diffs here:
https://paste.googleplex.com/6632343525654528

Bug: 158465496
Test: diff hiddenapi-flags.csv before and after
Change-Id: I082d18fc2b8a57ea8c5941d5c955a7970ab9d860
parent ecf54355

java/hiddenapi_singleton.go

+11 −14
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import ( 
	"fmt"



	"android/soong/android"

	"android/soong/genrule"

)



func init() {
@@ -224,30 +225,26 @@ func moduleForGreyListRemovedApis(ctx android.SingletonContext, module android.M 
// the unsupported API.

func flagsRule(ctx android.SingletonContext) android.Path {

	var flagsCSV android.Paths

	var greylistRemovedApis android.Paths

	var combinedRemovedApis android.Path



	ctx.VisitAllModules(func(module android.Module) {

		if h, ok := module.(hiddenAPIIntf); ok {

			if csv := h.flagsCSV(); csv != nil {

				flagsCSV = append(flagsCSV, csv)

			}

		} else if ds, ok := module.(*Droidstubs); ok {

			// Track @removed public and system APIs via corresponding droidstubs targets.

			// These APIs are not present in the stubs, however, we have to keep allowing access

			// to them at runtime.

			if moduleForGreyListRemovedApis(ctx, module) {

				greylistRemovedApis = append(greylistRemovedApis, ds.removedDexApiFile)

		} else if g, ok := module.(*genrule.Module); ok {

			if ctx.ModuleName(module) == "combined-removed-dex" {

				if len(g.GeneratedSourceFiles()) != 1 || combinedRemovedApis != nil {

					ctx.Errorf("Expected 1 combined-removed-dex module that generates 1 output file.")

				}

				combinedRemovedApis = g.GeneratedSourceFiles()[0]

			}

		}

	})



	combinedRemovedApis := android.PathForOutput(ctx, "hiddenapi", "combined-removed-dex.txt")

	ctx.Build(pctx, android.BuildParams{

		Rule:        android.Cat,

		Inputs:      greylistRemovedApis,

		Output:      combinedRemovedApis,

		Description: "Combine removed apis for " + combinedRemovedApis.String(),

	})

	if combinedRemovedApis == nil {

		ctx.Errorf("Failed to find combined-removed-dex.")

	}



	rule := android.NewRuleBuilder()