From c2b9f060d904351ef34c0a984e6c810138579ca2 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 13 Dec 2017 14:06:20 -0800 Subject: [PATCH] Add split PRODUCT_FULL_TREBLE variables to Soong. As a follow-up to this, Treble will be removed from Soong. Bug: 62019611 Test: manual Change-Id: I840e0d6130b834299d0cf3603443cc4c3f7f8e6d --- android/variable.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/android/variable.go b/android/variable.go index 681543825..f585599a7 100644 --- a/android/variable.go +++ b/android/variable.go @@ -70,10 +70,25 @@ type variableProperties struct { // treble is true when a build is a Treble compliant device. This is automatically set when // a build is shipped with Android O, but can be overriden. This controls such things as // the sepolicy split and enabling the Treble linker namespaces. + // TODO(b/62019611): remove Treble struct { Cflags []string } + // treble_linker_namespaces is true when the system/vendor linker namespace separation is + // enabled. + Treble_linker_namespaces struct { + Cflags []string + } + // sepolicy_split is true when system/vendor sepolicy split is enabled. + Sepolicy_split struct { + Cflags []string + } + // enforce_vintf_manifest is true when a device is required to have a vintf manifest. + Enforce_vintf_manifest struct { + Cflags []string + } + // debuggable is true for eng and userdebug builds, and can be used to turn on additional // debugging features that don't significantly impact runtime behavior. userdebug builds // are used for dogfooding and performance testing, and should be as similar to user builds @@ -158,6 +173,9 @@ type productVariables struct { Eng *bool `json:",omitempty"` Device_uses_hwc2 *bool `json:",omitempty"` Treble *bool `json:",omitempty"` + Treble_linker_namespaces *bool `json:",omitempty"` + Sepolicy_split *bool `json:",omitempty"` + Enforce_vintf_manifest *bool `json:",omitempty"` Pdk *bool `json:",omitempty"` Uml *bool `json:",omitempty"` MinimizeJavaDebugInfo *bool `json:",omitempty"`