From 653c78a9099263014fac0cab2ccb60feb70de7a4 Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Thu, 19 Dec 2019 12:38:10 +0000
Subject: [PATCH] Define a make variable for merged compat config.

This allows it to be added to the dist target.

Test: m dist
Change-Id: I1d913577f43a2ba3cb134ed35a7c98be76da2bd1
---
 java/platform_compat_config.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/platform_compat_config.go b/java/platform_compat_config.go
index 715485fd5..d5c7579e8 100644
--- 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()