From 2879d41a98c4c362894578dd7425299a4b534425 Mon Sep 17 00:00:00 2001
From: Roland Levillain <rpl@google.com>
Date: Tue, 13 Aug 2019 15:00:18 +0100
Subject: [PATCH] Allow modules to be enabled/disabled depending on whether
 APEXes are flattened.

Allow the `enabled` Soong/Blueprint property (e.g. in `genrule` and
`cc_prebuilt_binary` module definitions) to have a different value
when APEX flattening is enabled.

Test: m checkbuild
Bug: 139277987
Change-Id: Ic586bdfac7690077445da12543154381d92cf98e
Merged-In: Ic586bdfac7690077445da12543154381d92cf98e
---
 android/variable.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/variable.go b/android/variable.go
index 0931db852..3f2b9e9ff 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -115,6 +115,10 @@ type variableProperties struct {
 			Static_libs  []string
 			Srcs         []string
 		}
+
+		Flatten_apex struct {
+			Enabled *bool
+		}
 	} `android:"arch_variant"`
 }