From c381e100c958abcfa6081fa464ccdd02429501ec Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Thu, 6 Jul 2023 22:03:58 +0000 Subject: [PATCH] Add new Release_aidl_use_unfrozen soong variable this comes from a trunk stable build flag `RELEASE_AIDL_USE_UNFROZEN` and is used by the AIDL compiler when creating build rules for the generated AIDL libraries. Test: m Bug: 290265210 Change-Id: I94445c870ac908474e62db0b3172b64d53680852 --- android/config.go | 4 ++++ android/variable.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/android/config.go b/android/config.go index f95010e05..9f63d1b75 100644 --- a/android/config.go +++ b/android/config.go @@ -1932,6 +1932,10 @@ func (c *deviceConfig) RequiresInsecureExecmemForSwiftshader() bool { return c.config.productVariables.RequiresInsecureExecmemForSwiftshader } +func (c *deviceConfig) Release_aidl_use_unfrozen() bool { + return Bool(c.config.productVariables.Release_aidl_use_unfrozen) +} + func (c *config) SelinuxIgnoreNeverallows() bool { return c.productVariables.SelinuxIgnoreNeverallows } diff --git a/android/variable.go b/android/variable.go index f5dddafd8..5cfbc4884 100644 --- a/android/variable.go +++ b/android/variable.go @@ -180,6 +180,13 @@ type variableProperties struct { Srcs []string `android:"arch_variant"` Exclude_srcs []string `android:"arch_variant"` } `android:"arch_variant"` + + // release_aidl_use_unfrozen is "true" when a device can + // use the unfrozen versions of AIDL interfaces. + Release_aidl_use_unfrozen struct { + Cflags []string + Cmd *string + } } `android:"arch_variant"` } @@ -457,6 +464,8 @@ type ProductVariables struct { SelinuxIgnoreNeverallows bool `json:",omitempty"` + Release_aidl_use_unfrozen *bool `json:",omitempty"` + SepolicyFreezeTestExtraDirs []string `json:",omitempty"` SepolicyFreezeTestExtraPrebuiltDirs []string `json:",omitempty"`