diff options
| author | David Brazdil <dbrazdil@google.com> | 2019-01-18 16:30:03 +0000 |
|---|---|---|
| committer | David Brazdil <dbrazdil@google.com> | 2019-01-21 14:30:49 +0000 |
| commit | 0f670a22dfc99e87cb5ea1b913e3c73053a1cb2d (patch) | |
| tree | 77d8a03a1b20acd9de582176db18c475a63cfea6 /java/hiddenapi.go | |
| parent | 1eb88bb4944d9e7d0bd12fb073d6054133d896de (diff) | |
| download | android_build_soong-0f670a22dfc99e87cb5ea1b913e3c73053a1cb2d.tar.gz android_build_soong-0f670a22dfc99e87cb5ea1b913e3c73053a1cb2d.tar.bz2 android_build_soong-0f670a22dfc99e87cb5ea1b913e3c73053a1cb2d.zip | |
Replace hiddenapi-{public,private}-list.txt with a CSV file
`hiddenapi` is being refactored to work with a single CSV file as
opposued to a multitude of text files (one per flag). This patch
changes the singleton rule for listing public/private APIs from
stubs to expect a CSV as an output.
Bug: 119068555
Test: compiles, hiddenapi-flags.csv unchanged
Change-Id: I622521d59979a6b01ecc8065a278412fedf7b9bc
Diffstat (limited to 'java/hiddenapi.go')
| -rw-r--r-- | java/hiddenapi.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/java/hiddenapi.go b/java/hiddenapi.go index 29f23b1a..6a603cff 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -25,24 +25,24 @@ import ( ) var hiddenAPIGenerateCSVRule = pctx.AndroidStaticRule("hiddenAPIGenerateCSV", blueprint.RuleParams{ - Command: "${config.Class2Greylist} --public-api-list ${publicAPIList} $in $outFlag $out", + Command: "${config.Class2Greylist} --stub-api-flags ${stubAPIFlags} $in $outFlag $out", CommandDeps: []string{"${config.Class2Greylist}"}, -}, "outFlag", "publicAPIList") +}, "outFlag", "stubAPIFlags") func hiddenAPIGenerateCSV(ctx android.ModuleContext, classesJar android.Path) { flagsCSV := android.PathForModuleOut(ctx, "hiddenapi", "flags.csv") metadataCSV := android.PathForModuleOut(ctx, "hiddenapi", "metadata.csv") - publicList := &bootImagePath{ctx.Config().HiddenAPIPublicList()} + stubFlagsCSV := &bootImagePath{ctx.Config().HiddenAPIStubFlags()} ctx.Build(pctx, android.BuildParams{ Rule: hiddenAPIGenerateCSVRule, Description: "hiddenapi flags", Input: classesJar, Output: flagsCSV, - Implicit: publicList, + Implicit: stubFlagsCSV, Args: map[string]string{ - "outFlag": "--write-flags-csv", - "publicAPIList": publicList.String(), + "outFlag": "--write-flags-csv", + "stubAPIFlags": stubFlagsCSV.String(), }, }) @@ -51,10 +51,10 @@ func hiddenAPIGenerateCSV(ctx android.ModuleContext, classesJar android.Path) { Description: "hiddenapi metadata", Input: classesJar, Output: metadataCSV, - Implicit: publicList, + Implicit: stubFlagsCSV, Args: map[string]string{ - "outFlag": "--write-metadata-csv", - "publicAPIList": publicList.String(), + "outFlag": "--write-metadata-csv", + "stubAPIFlags": stubFlagsCSV.String(), }, }) |