Merge "Define a make variable for merged compat config." am: 62c085d7fe am: 950a589fe4 am: 6e024b5da9

Change-Id: I7d8a14256b5e24fe1073e22cc931834968d2a1ba
2020-01-08 22:56:26 +00:00
parent 16875f92b2 6e024b5da9
commit 1df33fc88a
1 changed files with 6 additions and 0 deletions
--- a/java/platform_compat_config.go
+++ b/java/platform_compat_config.go
@@ -80,6 +80,12 @@ func (p *platformCompatConfigSingleton) GenerateBuildActions(ctx android.Singlet
 	p.metadata = outputPath
 }

+func (p *platformCompatConfigSingleton) MakeVars(ctx android.MakeVarsContext) {
+	if p.metadata != nil {
+		ctx.Strict("INTERNAL_PLATFORM_MERGED_COMPAT_CONFIG", p.metadata.String())
+	}
+}
+
 func (p *platformCompatConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	rule := android.NewRuleBuilder()