commit adf591a50580e9724d9a38a2c1b25dde946db4da
author Ramy Medhat <abdelaal@google.com> Wed Jul 17 12:30:04 2019 +0000
committer Kousik Kumar <kousikk@google.com> Mon Aug 31 12:29:15 2020 +0000
tree 9c0d5cd24a3c27c5058a932d94fca6eeda20af81
parent 81aa8a42a1f14554f3f4bc117a0ba591fe134fa9

[DO NOT MERGE] Add USE_RBE support to soong.

Test: Built aosp_arm-user with and without USE_RBE. USE_RBE uses
a proxy script in place of rewrapper.

Bug: b/166182389
Change-Id: I5bf008a940513872d70b5b215bd6209f759826ae
Merged-In: I5bf008a940513872d70b5b215bd6209f759826ae

android/config.go

diff --git a/android/config.go b/android/config.go
index 3ea361e..7899119 100644
--- a/android/config.go
+++ b/android/config.go
@@ -714,6 +714,10 @@
 	return Bool(c.productVariables.UseGoma)
 }
 
+func (c *config) UseRBE() bool {
+	return Bool(c.productVariables.UseRBE)
+}
+
 func (c *config) RunErrorProne() bool {
 	return c.IsEnvTrue("RUN_ERROR_PRONE")
 }

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index e643c0e..28a8d0c 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -192,6 +192,7 @@
 	HostStaticBinaries               *bool `json:",omitempty"`
 	Binder32bit                      *bool `json:",omitempty"`
 	UseGoma                          *bool `json:",omitempty"`
+	UseRBE                           *bool `json:",omitempty"`
 	Debuggable                       *bool `json:",omitempty"`
 	Eng                              *bool `json:",omitempty"`
 	Treble_linker_namespaces         *bool `json:",omitempty"`