aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-05-20 00:19:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-20 00:19:37 +0000
commit35d1479b03a42e5ff5407cb9079aceaf8b57ac93 (patch)
treef5e0c50421e65a3885f98abb0d0b9b3dfec34938 /android
parent8a75529f907aa56a5be30250287ac43b89bb35ed (diff)
parentb3d3ced720ba6203f755f60ca2d33fb74646c4ee (diff)
downloadbuild_soong-35d1479b03a42e5ff5407cb9079aceaf8b57ac93.tar.gz
build_soong-35d1479b03a42e5ff5407cb9079aceaf8b57ac93.tar.bz2
build_soong-35d1479b03a42e5ff5407cb9079aceaf8b57ac93.zip
Merge "Add Treble as soong variable." am: a9ec71f54f am: 8fc756987e
am: b3d3ced720 Change-Id: Icbb81962f6a735c2da22b1d0ee2c4fa8a93d9250
Diffstat (limited to 'android')
-rw-r--r--android/variable.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/android/variable.go b/android/variable.go
index 699d9920..eeeef1c6 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -67,6 +67,13 @@ type variableProperties struct {
Cflags []string
}
+ // 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.
+ Treble 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
@@ -131,6 +138,7 @@ type productVariables struct {
Eng *bool `json:",omitempty"`
EnableCFI *bool `json:",omitempty"`
Device_uses_hwc2 *bool `json:",omitempty"`
+ Treble *bool `json:",omitempty"`
VendorPath *string `json:",omitempty"`