diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-12 17:24:36 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-04-14 18:54:29 +0100 |
| commit | 00b2bfdea57286232ac6c7ec36742d95c9d7a04e (patch) | |
| tree | 820915dace9c1b4f9a9a345dc6aa856fcf0b767a /java/hiddenapi_singleton.go | |
| parent | 9e7bfdae31f8b3bb16a7cb30a19f20881d9dec8f (diff) | |
Move hidden API index file rule to platform_bootclasspath
This change moves the monolithic hidden API index file creation rule
from the hiddenAPIIndexSingleton into the platform_bootclasspath. It
also moves the corresponding test from java/hiddenapi_singleton_test.go
to java/platform_bootclasspath_test.go.
Bug: 179354495
Test: verified that the out/soong/hiddenapi/... files are unchanged
by this change
Change-Id: Ia295d0f7ae9b51ea816f16921aa42339ed91704e
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index 6ba5f35bc..6c91a9140 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -416,32 +416,4 @@ func (h *hiddenAPIIndexSingleton) GenerateBuildActions(ctx android.SingletonCont h.index = outputPath return } - - indexes := android.Paths{} - ctx.VisitAllModules(func(module android.Module) { - if h, ok := module.(hiddenAPIIntf); ok { - if h.indexCSV() != nil { - indexes = append(indexes, h.indexCSV()) - } - } - }) - - rule := android.NewRuleBuilder(pctx, ctx) - rule.Command(). - BuiltTool("merge_csv"). - Flag("--key_field signature"). - FlagWithArg("--header=", "signature,file,startline,startcol,endline,endcol,properties"). - FlagWithOutput("--output=", hiddenAPISingletonPaths(ctx).index). - Inputs(indexes) - rule.Build("singleton-merged-hiddenapi-index", "Singleton merged Hidden API index") - - h.index = hiddenAPISingletonPaths(ctx).index -} - -func (h *hiddenAPIIndexSingleton) MakeVars(ctx android.MakeVarsContext) { - if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") { - return - } - - ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_INDEX", h.index.String()) } |