diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-29 13:50:01 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-04-29 15:11:35 +0100 |
| commit | 12d29b7786824ebc34ff6cc3e0e3b13dcfa27ec0 (patch) | |
| tree | b04d18303be4b670a026cc6ed9bd3b685a083b1c /java/platform_bootclasspath.go | |
| parent | e3ecce67c14e0edda22938648cb3a797ca2409ef (diff) | |
Move generation of hidden API make vars to platform_bootclasspath
Bug: 179354495
Test: rm out/soong/make_vars*
m nothing
grep INTERNAL_PLATFORM_HIDDENAPI_FLAGS out/soong/make_vars*
- make sure it is still out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I86e56512a9a2091f446bad25294d41ea1f4341ee
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index d341591d3..9f1629428 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -163,7 +163,7 @@ func (b *platformBootclasspathModule) GenerateSingletonBuildActions(android.Sing } func (d *platformBootclasspathModule) MakeVars(ctx android.MakeVarsContext) { - // Placeholder for now. + d.generateHiddenApiMakeVars(ctx) } func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) { @@ -319,6 +319,16 @@ func (b *platformBootclasspathModule) generatedHiddenAPIMetadataRules(ctx androi rule.Build("platform-bootclasspath-monolithic-hiddenapi-metadata", "monolithic hidden API metadata") } +// generateHiddenApiMakeVars generates make variables needed by hidden API related make rules, e.g. +// veridex and run-appcompat. +func (b *platformBootclasspathModule) generateHiddenApiMakeVars(ctx android.MakeVarsContext) { + if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") { + return + } + // INTERNAL_PLATFORM_HIDDENAPI_FLAGS is used by Make rules in art/ and cts/. + ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_FLAGS", b.hiddenAPIFlagsCSV.String()) +} + // generateBootImageBuildActions generates ninja rules related to the boot image creation. func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.ModuleContext, updatableModules []android.Module) { // Force the GlobalSoongConfig to be created and cached for use by the dex_bootjars |