Support eng product variable am: 6bc59ef731

am: 49cee3af30

Change-Id: Ifbca1925992f09b686f3ec460fc68c2e22c88431

android/variable.go

@@ -66,10 +66,21 @@ type variableProperties 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
+		// as possible.
 		Debuggable struct {
 			Cflags   []string
 			Cppflags []string
 		}
+
+		// eng is true for -eng builds, and can be used to turn on additionaly heavyweight debugging
+		// features.
+		Eng struct {
+			Cflags   []string
+			Cppflags []string
+		}
 	} `android:"arch_variant"`
 }
 
@@ -112,6 +123,7 @@ type productVariables struct {
 	Binder32bit                *bool `json:",omitempty"`
 	UseGoma                    *bool `json:",omitempty"`
 	Debuggable                 *bool `json:",omitempty"`
+	Eng                        *bool `json:",omitempty"`
 
 	VendorPath *string `json:",omitempty"`