diff --git a/descpb.bin b/descpb.bin
index 3a8fd0f..269bc8b 100644
--- a/descpb.bin
+++ b/descpb.bin
Binary files differ
diff --git a/go/chromite/api/test.pb.go b/go/chromite/api/test.pb.go
index 5b6911b..c1a1065 100644
--- a/go/chromite/api/test.pb.go
+++ b/go/chromite/api/test.pb.go
@@ -789,11 +789,11 @@
 	// Chrome source directory under which chromium will be built and tested
 	// using cros chrome-sdk.
 	ChromeRoot string `protobuf:"bytes,2,opt,name=chrome_root,json=chromeRoot,proto3" json:"chrome_root,omitempty"`
-	// If true, use goma when building Chrome.
-	UseGoma              bool     `protobuf:"varint,3,opt,name=use_goma,json=useGoma,proto3" json:"use_goma,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	// Options for using goma when building Chrome.
+	GomaConfig           *chromiumos.GomaConfig `protobuf:"bytes,3,opt,name=goma_config,json=gomaConfig,proto3" json:"goma_config,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
 }
 
 func (m *SimpleChromeWorkflowTestRequest) Reset()         { *m = SimpleChromeWorkflowTestRequest{} }
@@ -835,11 +835,11 @@
 	return ""
 }
 
-func (m *SimpleChromeWorkflowTestRequest) GetUseGoma() bool {
+func (m *SimpleChromeWorkflowTestRequest) GetGomaConfig() *chromiumos.GomaConfig {
 	if m != nil {
-		return m.UseGoma
+		return m.GomaConfig
 	}
-	return false
+	return nil
 }
 
 type SimpleChromeWorkflowTestResponse struct {
@@ -898,67 +898,68 @@
 func init() { proto.RegisterFile("chromite/api/test.proto", fileDescriptor_f5c91b4ac6233d9e) }
 
 var fileDescriptor_f5c91b4ac6233d9e = []byte{
-	// 986 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xeb, 0x6e, 0xdb, 0x36,
-	0x14, 0x9e, 0x1c, 0xdf, 0x7a, 0xe4, 0x24, 0x1a, 0x7b, 0x89, 0xca, 0x16, 0x48, 0xaa, 0x5e, 0x96,
-	0x0c, 0x9b, 0x0c, 0x64, 0x40, 0x31, 0x14, 0x18, 0xb0, 0xe6, 0xd2, 0x2e, 0x1b, 0xd6, 0x06, 0xb2,
-	0xb3, 0x0d, 0xc3, 0x36, 0x81, 0x76, 0x18, 0x59, 0x88, 0x24, 0x6a, 0x22, 0xed, 0xc1, 0x7f, 0xf7,
-	0x00, 0xfb, 0xb5, 0x07, 0xd9, 0x33, 0xf4, 0xef, 0x1e, 0x62, 0x4f, 0xd0, 0x77, 0x18, 0x44, 0xd2,
-	0xb6, 0xe4, 0x3a, 0x4e, 0xb2, 0xf5, 0x97, 0xcd, 0xc3, 0xef, 0x7c, 0x3c, 0xfc, 0xce, 0x85, 0x82,
-	0x8d, 0xfe, 0x20, 0x63, 0x71, 0x28, 0x68, 0x9b, 0xa4, 0x61, 0x5b, 0x50, 0x2e, 0xdc, 0x34, 0x63,
-	0x82, 0xa1, 0xd6, 0x64, 0xc3, 0x25, 0x69, 0x88, 0xef, 0x97, 0x60, 0xbd, 0x61, 0x18, 0x9d, 0xfa,
-	0x24, 0x0d, 0x15, 0x16, 0xe3, 0xd2, 0x2e, 0x1f, 0xf3, 0x8c, 0x31, 0xcd, 0x83, 0xf5, 0x01, 0xc3,
-	0x98, 0xf1, 0x76, 0x9f, 0xc5, 0x31, 0x4b, 0xd4, 0x86, 0xf3, 0x4f, 0x05, 0xf0, 0x5e, 0x4e, 0xd4,
-	0x25, 0x59, 0x40, 0xc5, 0x49, 0x12, 0x8a, 0x2e, 0xe5, 0xc2, 0xa3, 0xbf, 0x0e, 0x29, 0x17, 0xe8,
-	0x19, 0xb4, 0xd4, 0x31, 0x42, 0x6e, 0xdb, 0xc6, 0x96, 0xb1, 0x6d, 0xee, 0x6e, 0xb8, 0x33, 0x3a,
-	0xb7, 0xe0, 0xed, 0x99, 0xbd, 0xd9, 0x02, 0x6d, 0x82, 0x99, 0x51, 0x3e, 0x8c, 0x84, 0x9f, 0x12,
-	0x31, 0xb0, 0x2b, 0x5b, 0xc6, 0xf6, 0x0d, 0x0f, 0x94, 0xe9, 0x98, 0x88, 0x01, 0xfa, 0x18, 0xea,
-	0x39, 0x0f, 0x13, 0xf6, 0x8a, 0xa4, 0x45, 0x45, 0xda, 0x7d, 0xb9, 0xe3, 0x69, 0x04, 0x3a, 0x80,
-	0xda, 0x59, 0x44, 0x02, 0x6e, 0x57, 0x25, 0xd4, 0x75, 0x8b, 0xc2, 0xb8, 0x17, 0xdf, 0xc0, 0x7d,
-	0x91, 0x7b, 0x79, 0xca, 0x19, 0x1d, 0xc0, 0x87, 0x29, 0xe9, 0x9f, 0x93, 0x80, 0xfa, 0xbd, 0x88,
-	0xf4, 0xcf, 0xa3, 0x90, 0x0b, 0xbb, 0xb6, 0xb5, 0x32, 0x7f, 0xa7, 0x63, 0x05, 0x3a, 0x4a, 0xce,
-	0x98, 0x67, 0x69, 0x8f, 0xbd, 0x89, 0x03, 0xfe, 0x04, 0x6a, 0x92, 0x15, 0x3d, 0x84, 0x55, 0x1a,
-	0xa7, 0x62, 0xec, 0x6b, 0xb1, 0xa5, 0x3c, 0x4d, 0xaf, 0x25, 0x8d, 0x1d, 0x65, 0x73, 0x7e, 0x37,
-	0xe0, 0xde, 0xc2, 0xf8, 0x78, 0xca, 0x12, 0x4e, 0xd1, 0x03, 0x68, 0x09, 0x92, 0xf5, 0x48, 0x14,
-	0x29, 0x9d, 0x0c, 0xa9, 0x93, 0xa9, 0x6d, 0x52, 0xa8, 0x2f, 0x61, 0xfd, 0x8c, 0x84, 0x11, 0x3d,
-	0xf5, 0x75, 0x2c, 0xdc, 0xae, 0x2c, 0x0f, 0x7a, 0x4d, 0xe1, 0xb5, 0x89, 0x3b, 0x87, 0xb0, 0xb1,
-	0xaf, 0x05, 0x9b, 0x4f, 0xf1, 0x2c, 0x0b, 0xc6, 0x65, 0x59, 0x70, 0x30, 0xd8, 0xef, 0xd2, 0xa8,
-	0x7b, 0x38, 0x07, 0x70, 0x67, 0x3f, 0x63, 0xbc, 0x13, 0x06, 0x49, 0x98, 0x04, 0xff, 0xf5, 0x84,
-	0xbb, 0xb0, 0xa1, 0x58, 0x92, 0x60, 0xca, 0xa2, 0x0f, 0xe0, 0x70, 0xeb, 0x80, 0xf6, 0x86, 0x41,
-	0x7e, 0xc1, 0x22, 0x7d, 0x1b, 0x1a, 0x45, 0xfd, 0xcd, 0xdd, 0xdb, 0xe5, 0xe2, 0xd0, 0x89, 0xf0,
-	0x26, 0xa8, 0x42, 0x3c, 0x95, 0x4b, 0xe3, 0xd9, 0x80, 0xdb, 0x73, 0x87, 0xea, 0x68, 0xfe, 0xaa,
-	0xc2, 0xea, 0x77, 0xf1, 0xfb, 0xea, 0x95, 0x6b, 0x84, 0x84, 0x76, 0xa0, 0x31, 0x8a, 0x55, 0xad,
-	0xa8, 0xbe, 0xb1, 0xca, 0x55, 0x20, 0x06, 0x5e, 0x7d, 0x14, 0xcb, 0xc2, 0x79, 0x09, 0x26, 0xe7,
-	0x03, 0x9f, 0xa5, 0x22, 0x64, 0xc9, 0xa4, 0x77, 0x9e, 0x94, 0xe5, 0x29, 0x5d, 0xc2, 0xed, 0xf0,
-	0xc1, 0x6b, 0x85, 0xf6, 0x80, 0x4f, 0xff, 0xa3, 0xaf, 0xa1, 0x95, 0x4f, 0x25, 0x7f, 0x40, 0xb2,
-	0x84, 0x72, 0x6e, 0xd7, 0xb6, 0x8c, 0xed, 0xb5, 0xdd, 0x8f, 0x96, 0x31, 0xe5, 0xff, 0xbf, 0x52,
-	0x70, 0xcf, 0x14, 0xb3, 0x05, 0xfa, 0x02, 0x9a, 0xa3, 0xd8, 0xcf, 0x2d, 0xdc, 0xae, 0xcb, 0x32,
-	0x76, 0x96, 0xf1, 0xe8, 0x55, 0x63, 0x24, 0x7f, 0x39, 0xfe, 0x09, 0x60, 0x16, 0x24, 0x7a, 0x06,
-	0x56, 0x9a, 0x85, 0x23, 0x22, 0xa8, 0x7f, 0x4e, 0xc7, 0xb3, 0x0e, 0x5a, 0xa4, 0xca, 0x9a, 0x46,
-	0x7e, 0x43, 0xc7, 0x52, 0x1d, 0x04, 0xd5, 0x94, 0x65, 0x4a, 0xf2, 0x9a, 0x27, 0xff, 0x63, 0x07,
-	0xea, 0xea, 0x40, 0x64, 0x43, 0x23, 0x25, 0x42, 0xd0, 0x2c, 0xd1, 0x2d, 0x39, 0x59, 0x3a, 0x4f,
-	0xc1, 0x2c, 0x5c, 0x0e, 0xad, 0x83, 0x79, 0xf2, 0xaa, 0x73, 0x7c, 0xb8, 0x7f, 0xf4, 0xe2, 0xe8,
-	0xf0, 0xc0, 0xfa, 0x00, 0x35, 0xa1, 0xda, 0x7d, 0xde, 0xe9, 0x5a, 0x06, 0x6a, 0x41, 0xf3, 0xf9,
-	0x49, 0xf7, 0x75, 0xf7, 0xb0, 0xd3, 0xb5, 0x2a, 0x8e, 0x05, 0x6b, 0x93, 0xab, 0xe9, 0x22, 0xfa,
-	0xb3, 0x02, 0x37, 0xbf, 0x65, 0xbd, 0x88, 0xf4, 0xca, 0xa5, 0x74, 0x8d, 0x8e, 0x41, 0xaf, 0x60,
-	0x35, 0x8c, 0xf3, 0x89, 0x96, 0x92, 0x71, 0xc4, 0xc8, 0xa9, 0xae, 0xa0, 0x9d, 0xb2, 0xa6, 0x0b,
-	0x4e, 0x71, 0x8f, 0x95, 0x83, 0xd7, 0x92, 0xfe, 0x7a, 0x85, 0x8e, 0x61, 0xad, 0x4f, 0xfa, 0x83,
-	0x29, 0x1f, 0xb7, 0x57, 0x64, 0x92, 0xae, 0x41, 0xb8, 0x2a, 0x09, 0xf4, 0x8a, 0xe3, 0x36, 0x34,
-	0x26, 0xe4, 0x8f, 0xa0, 0xba, 0x34, 0x45, 0x72, 0xd7, 0xb9, 0x03, 0xb7, 0xca, 0xf4, 0x5a, 0xae,
-	0x3f, 0x0c, 0xd8, 0xec, 0x84, 0x71, 0x1a, 0x51, 0x39, 0x85, 0xe8, 0xf7, 0x2c, 0x3b, 0x3f, 0x8b,
-	0xd8, 0x6f, 0xff, 0x6b, 0x1a, 0x6c, 0x82, 0x29, 0x01, 0xd4, 0x9f, 0xf6, 0xdf, 0x0d, 0x0f, 0x94,
-	0xc9, 0xcb, 0x01, 0x77, 0xa1, 0x39, 0xe4, 0xd4, 0x0f, 0x58, 0x4c, 0x64, 0xc3, 0x35, 0xbd, 0xc6,
-	0x90, 0xd3, 0x97, 0x2c, 0x26, 0x8e, 0x03, 0x5b, 0x17, 0xc7, 0xa3, 0x82, 0xde, 0xfd, 0xbb, 0xa6,
-	0xca, 0xa5, 0x43, 0xb3, 0x51, 0xd8, 0xa7, 0x28, 0x83, 0x9b, 0x0b, 0x9e, 0x03, 0xb4, 0x7d, 0xd5,
-	0x17, 0x0d, 0xef, 0x5c, 0x01, 0xa9, 0x05, 0xab, 0xbf, 0x79, 0x8b, 0x2b, 0x56, 0x05, 0x11, 0xb0,
-	0xe6, 0xe7, 0x36, 0x7a, 0x5c, 0xa6, 0xb9, 0xe0, 0x79, 0xc0, 0x4f, 0x2e, 0x83, 0xe9, 0x67, 0xec,
-	0x17, 0x58, 0x9f, 0x1b, 0xff, 0xe8, 0xd1, 0x9c, 0xeb, 0xc2, 0xd7, 0x01, 0x3f, 0x5e, 0x84, 0x7a,
-	0x67, 0xfa, 0xa3, 0x1f, 0x60, 0xb5, 0x34, 0x88, 0xd1, 0xdc, 0xd0, 0x58, 0xf4, 0x34, 0xe0, 0x87,
-	0x4b, 0x31, 0x9a, 0x79, 0x7f, 0xda, 0xf2, 0xf7, 0x96, 0xcc, 0x21, 0x7c, 0x7f, 0xf1, 0xa6, 0x26,
-	0xf9, 0x19, 0x5a, 0xc5, 0x92, 0x45, 0x0f, 0x2e, 0xed, 0x16, 0xec, 0x2c, 0x83, 0xcc, 0x25, 0x70,
-	0x0c, 0xf6, 0x45, 0x85, 0x86, 0x3e, 0x9d, 0x2b, 0xf0, 0xe5, 0x0d, 0x82, 0xdd, 0xab, 0xc2, 0x55,
-	0x08, 0xb8, 0xf5, 0xe6, 0x2d, 0x6e, 0x42, 0x35, 0x9f, 0xd7, 0x96, 0xb1, 0xf7, 0xf9, 0x8f, 0x4f,
-	0x03, 0x36, 0x6d, 0x5b, 0x97, 0x65, 0x41, 0xbb, 0xf0, 0x69, 0x19, 0x26, 0x67, 0x19, 0x69, 0xcb,
-	0x2f, 0xcb, 0x76, 0xc0, 0xda, 0xc5, 0x0f, 0xd2, 0x5e, 0x5d, 0x9a, 0x3f, 0xfb, 0x37, 0x00, 0x00,
-	0xff, 0xff, 0x58, 0x6f, 0xc3, 0xbf, 0xec, 0x0a, 0x00, 0x00,
+	// 997 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdd, 0x6e, 0xe3, 0xc4,
+	0x17, 0xff, 0x3b, 0x4d, 0xd2, 0xee, 0x71, 0xda, 0xfa, 0x3f, 0xbb, 0xdb, 0x9a, 0xd9, 0x95, 0xda,
+	0xf5, 0x7e, 0xd0, 0x22, 0x70, 0xa4, 0x22, 0x2d, 0x68, 0x25, 0x24, 0xb6, 0x69, 0x77, 0x29, 0x88,
+	0xdd, 0xca, 0x49, 0x01, 0x21, 0xc0, 0x9a, 0xa4, 0x13, 0xc7, 0xaa, 0xed, 0x31, 0x9e, 0x49, 0x50,
+	0x6e, 0x79, 0x06, 0x1e, 0x83, 0x0b, 0x9e, 0x61, 0x6f, 0x79, 0x08, 0x9e, 0x60, 0xdf, 0x01, 0x79,
+	0x66, 0x92, 0xd8, 0xd9, 0x34, 0x6d, 0x81, 0xab, 0x78, 0xce, 0xf9, 0x9d, 0xdf, 0x9c, 0x73, 0xe6,
+	0x7c, 0x04, 0xb6, 0x7b, 0x83, 0x8c, 0xc5, 0xa1, 0xa0, 0x4d, 0x92, 0x86, 0x4d, 0x41, 0xb9, 0x70,
+	0xd3, 0x8c, 0x09, 0x86, 0x1a, 0x13, 0x85, 0x4b, 0xd2, 0x10, 0xdf, 0x2f, 0xc1, 0xba, 0xc3, 0x30,
+	0x3a, 0xf7, 0x49, 0x1a, 0x2a, 0x2c, 0xc6, 0x25, 0x2d, 0x1f, 0xf3, 0x8c, 0x31, 0xcd, 0x83, 0xf5,
+	0x05, 0xc3, 0x98, 0xf1, 0x66, 0x8f, 0xc5, 0x31, 0x4b, 0x94, 0xc2, 0xf9, 0xab, 0x02, 0xf8, 0x30,
+	0x27, 0xea, 0x90, 0x2c, 0xa0, 0xe2, 0x2c, 0x09, 0x45, 0x87, 0x72, 0xe1, 0xd1, 0x9f, 0x87, 0x94,
+	0x0b, 0xf4, 0x0c, 0x1a, 0xea, 0x1a, 0x21, 0xd5, 0xb6, 0xb1, 0x6b, 0xec, 0x99, 0x07, 0xdb, 0xee,
+	0x8c, 0xce, 0x2d, 0x58, 0x7b, 0x66, 0x77, 0x76, 0x40, 0x3b, 0x60, 0x66, 0x94, 0x0f, 0x23, 0xe1,
+	0xa7, 0x44, 0x0c, 0xec, 0xca, 0xae, 0xb1, 0x77, 0xcb, 0x03, 0x25, 0x3a, 0x25, 0x62, 0x80, 0x3e,
+	0x80, 0x7a, 0xce, 0xc3, 0x84, 0xbd, 0x22, 0x69, 0x51, 0x91, 0xb6, 0x25, 0x35, 0x9e, 0x46, 0xa0,
+	0x23, 0xa8, 0xf5, 0x23, 0x12, 0x70, 0xbb, 0x2a, 0xa1, 0xae, 0x5b, 0x4c, 0x8c, 0x7b, 0x79, 0x04,
+	0xee, 0x8b, 0xdc, 0xca, 0x53, 0xc6, 0xe8, 0x08, 0xfe, 0x9f, 0x92, 0xde, 0x05, 0x09, 0xa8, 0xdf,
+	0x8d, 0x48, 0xef, 0x22, 0x0a, 0xb9, 0xb0, 0x6b, 0xbb, 0x2b, 0xf3, 0x31, 0x9d, 0x2a, 0xd0, 0x49,
+	0xd2, 0x67, 0x9e, 0xa5, 0x2d, 0x0e, 0x27, 0x06, 0xf8, 0x43, 0xa8, 0x49, 0x56, 0xf4, 0x10, 0xd6,
+	0x69, 0x9c, 0x8a, 0xb1, 0xaf, 0x93, 0x2d, 0xd3, 0xb3, 0xe6, 0x35, 0xa4, 0xb0, 0xad, 0x64, 0xce,
+	0xaf, 0x06, 0xdc, 0x5b, 0xe8, 0x1f, 0x4f, 0x59, 0xc2, 0x29, 0x7a, 0x00, 0x0d, 0x41, 0xb2, 0x2e,
+	0x89, 0x22, 0x95, 0x27, 0x43, 0xe6, 0xc9, 0xd4, 0x32, 0x99, 0xa8, 0xcf, 0x61, 0xb3, 0x4f, 0xc2,
+	0x88, 0x9e, 0xfb, 0xda, 0x17, 0x6e, 0x57, 0x96, 0x3b, 0xbd, 0xa1, 0xf0, 0x5a, 0xc4, 0x9d, 0x63,
+	0xd8, 0x6e, 0xe9, 0x84, 0xcd, 0x3f, 0xf1, 0xec, 0x15, 0x8c, 0xab, 0x5e, 0xc1, 0xc1, 0x60, 0xbf,
+	0x4b, 0xa3, 0xe2, 0x70, 0x8e, 0x60, 0xab, 0x95, 0x31, 0xde, 0x0e, 0x83, 0x24, 0x4c, 0x82, 0x7f,
+	0x7a, 0xc3, 0x7b, 0xb0, 0xad, 0x58, 0x92, 0x60, 0xca, 0xa2, 0x2f, 0xe0, 0x70, 0xe7, 0x88, 0x76,
+	0x87, 0x41, 0x1e, 0x60, 0x91, 0xbe, 0x09, 0xab, 0xc5, 0xfc, 0x9b, 0x07, 0x77, 0xcb, 0xc5, 0xa1,
+	0x1f, 0xc2, 0x9b, 0xa0, 0x0a, 0xfe, 0x54, 0xae, 0xf4, 0x67, 0x1b, 0xee, 0xce, 0x5d, 0xaa, 0xbd,
+	0xf9, 0xa3, 0x0a, 0xeb, 0xdf, 0xc4, 0xff, 0x55, 0xaf, 0xdc, 0xc0, 0x25, 0xb4, 0x0f, 0xab, 0xa3,
+	0x58, 0xd5, 0x8a, 0xea, 0x1b, 0xab, 0x5c, 0x05, 0x62, 0xe0, 0xd5, 0x47, 0xb1, 0x2c, 0x9c, 0x97,
+	0x60, 0x72, 0x3e, 0xf0, 0x59, 0x2a, 0x42, 0x96, 0x4c, 0x7a, 0xe7, 0x49, 0x39, 0x3d, 0xa5, 0x20,
+	0xdc, 0x36, 0x1f, 0xbc, 0x56, 0x68, 0x0f, 0xf8, 0xf4, 0x1b, 0x7d, 0x09, 0x8d, 0x7c, 0x2a, 0xf9,
+	0x03, 0x92, 0x25, 0x94, 0x73, 0xbb, 0xb6, 0x6b, 0xec, 0x6d, 0x1c, 0xbc, 0xbf, 0x8c, 0x29, 0xff,
+	0xfe, 0x42, 0xc1, 0x3d, 0x53, 0xcc, 0x0e, 0xe8, 0x33, 0x58, 0x1b, 0xc5, 0x7e, 0x2e, 0xe1, 0x76,
+	0x5d, 0x96, 0xb1, 0xb3, 0x8c, 0x47, 0x9f, 0x56, 0x47, 0xf2, 0x97, 0xe3, 0x1f, 0x00, 0x66, 0x4e,
+	0xa2, 0x67, 0x60, 0xa5, 0x59, 0x38, 0x22, 0x82, 0xfa, 0x17, 0x74, 0x3c, 0xeb, 0xa0, 0x45, 0x59,
+	0xd9, 0xd0, 0xc8, 0xaf, 0xe8, 0x58, 0x66, 0x07, 0x41, 0x35, 0x65, 0x99, 0x4a, 0x79, 0xcd, 0x93,
+	0xdf, 0xd8, 0x81, 0xba, 0xba, 0x10, 0xd9, 0xb0, 0x9a, 0x12, 0x21, 0x68, 0x96, 0xe8, 0x96, 0x9c,
+	0x1c, 0x9d, 0xa7, 0x60, 0x16, 0x82, 0x43, 0x9b, 0x60, 0x9e, 0xbd, 0x6a, 0x9f, 0x1e, 0xb7, 0x4e,
+	0x5e, 0x9c, 0x1c, 0x1f, 0x59, 0xff, 0x43, 0x6b, 0x50, 0xed, 0x3c, 0x6f, 0x77, 0x2c, 0x03, 0x35,
+	0x60, 0xed, 0xf9, 0x59, 0xe7, 0x75, 0xe7, 0xb8, 0xdd, 0xb1, 0x2a, 0x8e, 0x05, 0x1b, 0x93, 0xd0,
+	0x74, 0x11, 0xfd, 0x56, 0x81, 0xdb, 0x5f, 0xb3, 0x6e, 0x44, 0xba, 0xe5, 0x52, 0xba, 0x41, 0xc7,
+	0xa0, 0x57, 0xb0, 0x1e, 0xc6, 0xf9, 0x44, 0x4b, 0xc9, 0x38, 0x62, 0xe4, 0x5c, 0x57, 0xd0, 0x7e,
+	0x39, 0xa7, 0x0b, 0x6e, 0x71, 0x4f, 0x95, 0x81, 0xd7, 0x90, 0xf6, 0xfa, 0x84, 0x4e, 0x61, 0xa3,
+	0x47, 0x7a, 0x83, 0x29, 0x1f, 0xb7, 0x57, 0xe4, 0x23, 0xdd, 0x80, 0x70, 0x5d, 0x12, 0xe8, 0x13,
+	0xc7, 0x4d, 0x58, 0x9d, 0x90, 0x3f, 0x82, 0xea, 0xd2, 0x27, 0x92, 0x5a, 0x67, 0x0b, 0xee, 0x94,
+	0xe9, 0x75, 0xba, 0x7e, 0x37, 0x60, 0xa7, 0x1d, 0xc6, 0x69, 0x44, 0xe5, 0x14, 0xa2, 0xdf, 0xb2,
+	0xec, 0xa2, 0x1f, 0xb1, 0x5f, 0xfe, 0xd5, 0x34, 0xd8, 0x01, 0x53, 0x02, 0xa8, 0x3f, 0xed, 0xbf,
+	0x5b, 0x1e, 0x28, 0x91, 0x97, 0x03, 0x3e, 0x01, 0x33, 0x60, 0x31, 0xf1, 0x7b, 0x2c, 0xe9, 0x87,
+	0x81, 0xee, 0xb9, 0xad, 0xa2, 0xeb, 0x2f, 0x59, 0x4c, 0x5a, 0x52, 0xeb, 0x41, 0x30, 0xfd, 0x76,
+	0x1c, 0xd8, 0xbd, 0xdc, 0x5b, 0x15, 0xd2, 0xc1, 0x9f, 0x35, 0x55, 0x4c, 0x6d, 0x9a, 0x8d, 0xc2,
+	0x1e, 0x45, 0x19, 0xdc, 0x5e, 0xb0, 0x2c, 0xd0, 0xde, 0x75, 0xf7, 0x1d, 0xde, 0xbf, 0x06, 0x52,
+	0xa7, 0xb3, 0xfe, 0xe6, 0x2d, 0xae, 0x58, 0x15, 0x44, 0xc0, 0x9a, 0x9f, 0xea, 0xe8, 0x71, 0x99,
+	0xe6, 0x92, 0xe5, 0x81, 0x9f, 0x5c, 0x05, 0xd3, 0x4b, 0xee, 0x27, 0xd8, 0x9c, 0x5b, 0x0e, 0xe8,
+	0xd1, 0x9c, 0xe9, 0xc2, 0xdd, 0x81, 0x1f, 0x2f, 0x42, 0xbd, 0xb3, 0x1b, 0xd0, 0x77, 0xb0, 0x5e,
+	0x1a, 0xd3, 0x68, 0x6e, 0xa4, 0x2c, 0x5a, 0x1c, 0xf8, 0xe1, 0x52, 0x8c, 0x66, 0x6e, 0x4d, 0x07,
+	0xc2, 0xbd, 0x25, 0x53, 0x0a, 0xdf, 0x5f, 0xac, 0xd4, 0x24, 0x3f, 0x42, 0xa3, 0x58, 0xd0, 0xe8,
+	0xc1, 0x95, 0xbd, 0x84, 0x9d, 0x65, 0x90, 0xb9, 0x07, 0x1c, 0x83, 0x7d, 0x59, 0xa1, 0xa1, 0x8f,
+	0xe6, 0xca, 0x7f, 0x79, 0xfb, 0x60, 0xf7, 0xba, 0x70, 0xe5, 0x02, 0x6e, 0xbc, 0x79, 0x8b, 0xd7,
+	0xa0, 0x9a, 0x4f, 0x73, 0xcb, 0x38, 0xfc, 0xf4, 0xfb, 0xa7, 0x01, 0x9b, 0x76, 0x86, 0xcb, 0xb2,
+	0xa0, 0x59, 0xf8, 0xe3, 0x19, 0x26, 0xfd, 0x8c, 0x34, 0xe5, 0xff, 0xce, 0x66, 0xc0, 0x9a, 0xc5,
+	0xbf, 0xab, 0xdd, 0xba, 0x14, 0x7f, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xef, 0x3c,
+	0x95, 0x0a, 0x0b, 0x00, 0x00,
 }
diff --git a/go/chromiumos/common.pb.go b/go/chromiumos/common.pb.go
index 4140bdb..2ecc315 100644
--- a/go/chromiumos/common.pb.go
+++ b/go/chromiumos/common.pb.go
@@ -352,7 +352,10 @@
 	// Required.
 	GomaDir string `protobuf:"bytes,1,opt,name=goma_dir,json=gomaDir,proto3" json:"goma_dir,omitempty"`
 	// The goma client credentials file.
-	GomaClientJson       string   `protobuf:"bytes,2,opt,name=goma_client_json,json=gomaClientJson,proto3" json:"goma_client_json,omitempty"`
+	GomaClientJson string `protobuf:"bytes,2,opt,name=goma_client_json,json=gomaClientJson,proto3" json:"goma_client_json,omitempty"`
+	// Path to the Goma client used for build package.
+	// If None, goma_dir will be used instead.
+	ChromeosGomaDir      string   `protobuf:"bytes,3,opt,name=chromeos_goma_dir,json=chromeosGomaDir,proto3" json:"chromeos_goma_dir,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -397,6 +400,13 @@
 	return ""
 }
 
+func (m *GomaConfig) GetChromeosGomaDir() string {
+	if m != nil {
+		return m.ChromeosGomaDir
+	}
+	return ""
+}
+
 // Message describing a package, The corresponding variable names are from
 // https://devmanual.gentoo.org/ebuild-writing/variables/index.html
 type PackageInfo struct {
@@ -651,49 +661,50 @@
 func init() { proto.RegisterFile("chromiumos/common.proto", fileDescriptor_fa0b57c3d7d4c63b) }
 
 var fileDescriptor_fa0b57c3d7d4c63b = []byte{
-	// 702 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xdd, 0x6e, 0xa3, 0x46,
-	0x14, 0x8e, 0x7f, 0x62, 0xc3, 0xc1, 0x4d, 0xe8, 0xa4, 0x6a, 0x9c, 0xb4, 0x91, 0x12, 0xda, 0x0b,
-	0x37, 0x17, 0x76, 0xe4, 0x26, 0xed, 0x35, 0xc6, 0x38, 0xa5, 0x72, 0xb0, 0x3b, 0xc6, 0xa9, 0xdc,
-	0x1b, 0x34, 0x25, 0x63, 0x4c, 0x0b, 0x8c, 0x05, 0x38, 0x52, 0xf6, 0x05, 0xf6, 0x15, 0xf6, 0x01,
-	0xf6, 0x41, 0x57, 0x33, 0x80, 0x8d, 0x76, 0xf7, 0xca, 0xf3, 0xfd, 0xcc, 0xe1, 0x3b, 0xe7, 0x80,
-	0xe1, 0xdc, 0xdb, 0x24, 0x2c, 0x0a, 0x76, 0x11, 0x4b, 0x07, 0x1e, 0x8b, 0x22, 0x16, 0xf7, 0xb7,
-	0x09, 0xcb, 0x18, 0x82, 0x83, 0xa0, 0xdd, 0x80, 0x32, 0xda, 0x05, 0xe1, 0x8b, 0x43, 0x12, 0x9f,
-	0x66, 0x08, 0x41, 0x33, 0x26, 0x11, 0xed, 0xd6, 0xae, 0x6b, 0x3d, 0x19, 0x8b, 0xb3, 0xf6, 0xb1,
-	0x0e, 0x2d, 0x63, 0x93, 0x30, 0x26, 0xe4, 0x2d, 0xc9, 0x36, 0xa5, 0xcc, 0xcf, 0xe8, 0x07, 0x90,
-	0x3d, 0xe2, 0x6d, 0xa8, 0xfb, 0x12, 0x24, 0xdd, 0xba, 0x10, 0x24, 0x41, 0x8c, 0x83, 0x04, 0xf5,
-	0xa1, 0x41, 0xe3, 0xd7, 0x6e, 0xe3, 0xba, 0xd6, 0x53, 0x86, 0x3f, 0xf6, 0x0f, 0x0f, 0xee, 0xe7,
-	0x15, 0x8b, 0x1f, 0x33, 0x7e, 0xc5, 0xdc, 0x88, 0xae, 0x20, 0x0f, 0x97, 0x57, 0x6b, 0x8a, 0x6a,
-	0x72, 0xce, 0xf0, 0x72, 0xb7, 0xd0, 0xf4, 0x59, 0x44, 0xba, 0xc7, 0xa2, 0xde, 0xf7, 0xd5, 0x7a,
-	0x8f, 0x2c, 0x22, 0x06, 0x8b, 0xd7, 0x81, 0x8f, 0x85, 0xe7, 0x32, 0x06, 0x79, 0x5f, 0x1c, 0xdd,
-	0x81, 0xbc, 0x4b, 0xa9, 0xbb, 0x0e, 0x89, 0x9f, 0x76, 0x6b, 0xd7, 0x8d, 0x9e, 0x32, 0x3c, 0xab,
-	0xde, 0x5e, 0xa6, 0x74, 0x12, 0x12, 0x1f, 0x4b, 0xbb, 0xfc, 0x90, 0xa2, 0x01, 0x48, 0x6b, 0x4a,
-	0xb2, 0x5d, 0x42, 0xd3, 0x6e, 0xfd, 0xcb, 0x0b, 0x93, 0x5c, 0xc3, 0x7b, 0x93, 0xf6, 0x13, 0xb4,
-	0x0b, 0x12, 0x75, 0xa1, 0x5d, 0xd0, 0xc5, 0xa4, 0x4a, 0xa8, 0xfd, 0x05, 0x70, 0x08, 0x8a, 0x2e,
-	0x40, 0xe2, 0x51, 0x45, 0xaf, 0x85, 0x91, 0x63, 0xde, 0x69, 0x0f, 0x54, 0x21, 0x79, 0x61, 0x40,
-	0xe3, 0xcc, 0xfd, 0x2f, 0x65, 0x71, 0x31, 0xdc, 0x13, 0xce, 0x1b, 0x82, 0xfe, 0x33, 0x65, 0xb1,
-	0xb6, 0x06, 0x65, 0x4e, 0xbc, 0xff, 0x89, 0x4f, 0xad, 0x78, 0xcd, 0xd0, 0x0d, 0x74, 0xb6, 0x39,
-	0x74, 0x2b, 0x9b, 0x54, 0x0a, 0xce, 0x26, 0x11, 0x45, 0x97, 0x20, 0x79, 0x24, 0xa3, 0x3e, 0x4b,
-	0xde, 0x0e, 0x0b, 0xcb, 0x31, 0x8f, 0xfe, 0x4a, 0x93, 0x34, 0x60, 0xb1, 0x58, 0x9a, 0x8c, 0x4b,
-	0xa8, 0xbd, 0xaf, 0x41, 0x73, 0xce, 0x17, 0xfe, 0xb5, 0x97, 0xe0, 0x01, 0xa4, 0x90, 0x79, 0x24,
-	0x0b, 0x8a, 0x98, 0x27, 0xc3, 0x8b, 0xea, 0xb4, 0xf8, 0xbd, 0xfe, 0xb4, 0x30, 0xe0, 0xbd, 0x55,
-	0xbb, 0x07, 0xa9, 0x64, 0xd1, 0x29, 0x28, 0xf6, 0xcc, 0x9d, 0xce, 0x0c, 0xdd, 0xb1, 0x66, 0xb6,
-	0x7a, 0x84, 0x00, 0x5a, 0x96, 0xbd, 0xb0, 0xc6, 0xa6, 0x5a, 0x43, 0x0a, 0xb4, 0x67, 0x4b, 0x47,
-	0x80, 0xba, 0x36, 0x04, 0xc0, 0x34, 0xdd, 0x85, 0x99, 0x88, 0xf3, 0x73, 0x25, 0x8e, 0x32, 0x54,
-	0x3f, 0x7f, 0x6c, 0x1e, 0x50, 0xbb, 0x82, 0x76, 0xb1, 0x63, 0x9e, 0x9f, 0xbf, 0x07, 0x65, 0x7e,
-	0x7e, 0xd6, 0x7e, 0x07, 0x98, 0xf3, 0x6f, 0x63, 0xf4, 0x96, 0xd1, 0x14, 0xfd, 0x02, 0x6a, 0x4a,
-	0x93, 0x80, 0x84, 0xc1, 0x3b, 0xfa, 0xe2, 0x8a, 0x8f, 0x46, 0xb8, 0x3b, 0xf8, 0xf4, 0xc0, 0x0b,
-	0xff, 0xed, 0x87, 0x1a, 0xc8, 0x56, 0x44, 0x7c, 0xea, 0xbc, 0x6d, 0xf9, 0xe2, 0xbf, 0xb3, 0x9e,
-	0xf4, 0x47, 0xd3, 0x75, 0x56, 0x73, 0xd3, 0x5d, 0xda, 0x63, 0x73, 0x62, 0xd9, 0xe6, 0x58, 0x3d,
-	0x42, 0x12, 0x34, 0x47, 0xfa, 0x82, 0xb7, 0xd2, 0x86, 0xc6, 0xd8, 0x7c, 0x56, 0xeb, 0x9c, 0x72,
-	0xcc, 0x85, 0xa3, 0x36, 0x78, 0x77, 0x5c, 0x74, 0x9f, 0x9f, 0xd4, 0x26, 0x07, 0x9c, 0xe6, 0xe0,
-	0x18, 0x75, 0x40, 0xc2, 0xa6, 0x31, 0x7b, 0x36, 0xf1, 0x4a, 0x6d, 0x71, 0x69, 0xa2, 0x1b, 0xce,
-	0x0c, 0xaf, 0xd4, 0x36, 0x97, 0x26, 0x16, 0x7e, 0xfa, 0x5b, 0xc7, 0xa6, 0x2a, 0xa1, 0x6f, 0xe1,
-	0x1b, 0x03, 0x3f, 0xdc, 0xb9, 0x7b, 0x4a, 0xbe, 0x8d, 0xa0, 0x6d, 0x6c, 0x48, 0x1c, 0xd3, 0x10,
-	0x9d, 0xc3, 0x99, 0xf1, 0x87, 0x6e, 0xdb, 0xe6, 0xd4, 0x5d, 0xda, 0x8b, 0xb9, 0x69, 0x58, 0x13,
-	0x4b, 0xc4, 0x42, 0x70, 0x52, 0x0a, 0x0b, 0x47, 0x1f, 0x4d, 0x79, 0x40, 0x15, 0x3a, 0x25, 0x37,
-	0x32, 0x1d, 0x5d, 0xad, 0xf3, 0xd5, 0x94, 0x0c, 0x8f, 0xde, 0xa8, 0x5e, 0x33, 0x74, 0x5b, 0xc7,
-	0x2b, 0xb5, 0x39, 0xfa, 0xed, 0x9f, 0x7b, 0x9f, 0xed, 0xa7, 0xdf, 0x67, 0x89, 0x3f, 0xa8, 0xfc,
-	0x01, 0x05, 0xf1, 0x3a, 0x21, 0x03, 0x31, 0xca, 0x81, 0xcf, 0x2a, 0xca, 0xbf, 0x2d, 0x41, 0xfe,
-	0xfa, 0x29, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xf6, 0x3a, 0x01, 0xaf, 0x04, 0x00, 0x00,
+	// 719 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x54, 0xcd, 0x6e, 0xda, 0x4c,
+	0x14, 0x0d, 0x3f, 0x01, 0x73, 0xcd, 0x97, 0x38, 0x93, 0x4f, 0x0d, 0x49, 0x1b, 0x29, 0x71, 0xbb,
+	0xa0, 0x2c, 0x20, 0xa2, 0x49, 0xbb, 0x36, 0xc6, 0xa4, 0xae, 0x88, 0x41, 0xc6, 0xa4, 0xa2, 0x1b,
+	0x6b, 0xea, 0x0c, 0xc6, 0xad, 0xed, 0x41, 0xb6, 0x89, 0x94, 0x4a, 0x5d, 0xf7, 0x15, 0xfa, 0x00,
+	0x7d, 0xd0, 0x6a, 0xc6, 0x36, 0x58, 0x6d, 0x57, 0xcc, 0x3d, 0xe7, 0xcc, 0x99, 0x73, 0xef, 0x8c,
+	0x81, 0x13, 0x67, 0x15, 0xd1, 0xc0, 0xdb, 0x04, 0x34, 0xee, 0x39, 0x34, 0x08, 0x68, 0xd8, 0x5d,
+	0x47, 0x34, 0xa1, 0x08, 0x76, 0x84, 0x7c, 0x09, 0xe2, 0x60, 0xe3, 0xf9, 0x0f, 0x16, 0x8e, 0x5c,
+	0x92, 0x20, 0x04, 0xd5, 0x10, 0x07, 0xa4, 0x55, 0xba, 0x28, 0xb5, 0x1b, 0x26, 0x5f, 0xcb, 0xbf,
+	0xca, 0x50, 0x53, 0x57, 0x11, 0xa5, 0x9c, 0x5e, 0xe3, 0x64, 0x95, 0xd3, 0x6c, 0x8d, 0x9e, 0x43,
+	0xc3, 0xc1, 0xce, 0x8a, 0xd8, 0x0f, 0x5e, 0xd4, 0x2a, 0x73, 0x42, 0xe0, 0xc0, 0xd0, 0x8b, 0x50,
+	0x17, 0x2a, 0x24, 0x7c, 0x6c, 0x55, 0x2e, 0x4a, 0x6d, 0xb1, 0xff, 0xa2, 0xbb, 0x3b, 0xb8, 0x9b,
+	0x3a, 0x66, 0x3f, 0x5a, 0xf8, 0x68, 0x32, 0x21, 0x3a, 0x87, 0x34, 0x5c, 0xea, 0x56, 0xe5, 0x6e,
+	0x8d, 0x14, 0x61, 0x76, 0x1d, 0xa8, 0xba, 0x34, 0xc0, 0xad, 0x7d, 0xee, 0xf7, 0xac, 0xe8, 0x77,
+	0x4b, 0x03, 0xac, 0xd2, 0x70, 0xe9, 0xb9, 0x26, 0xd7, 0x9c, 0x85, 0xd0, 0xd8, 0x9a, 0xa3, 0x2b,
+	0x68, 0x6c, 0x62, 0x62, 0x2f, 0x7d, 0xec, 0xc6, 0xad, 0xd2, 0x45, 0xa5, 0x2d, 0xf6, 0x8f, 0x8b,
+	0xbb, 0xe7, 0x31, 0x19, 0xf9, 0xd8, 0x35, 0x85, 0x4d, 0xba, 0x88, 0x51, 0x0f, 0x84, 0x25, 0xc1,
+	0xc9, 0x26, 0x22, 0x71, 0xab, 0xfc, 0xf7, 0x86, 0x51, 0xca, 0x99, 0x5b, 0x91, 0xfc, 0x12, 0xea,
+	0x19, 0x88, 0x5a, 0x50, 0xcf, 0xe0, 0x6c, 0x52, 0x79, 0x29, 0x7f, 0x07, 0xd8, 0x05, 0x45, 0xa7,
+	0x20, 0xb0, 0xa8, 0xbc, 0xd7, 0x4c, 0xc8, 0x6a, 0xd6, 0x69, 0x1b, 0x24, 0x4e, 0x39, 0xbe, 0x47,
+	0xc2, 0xc4, 0xfe, 0x12, 0xd3, 0x30, 0x1b, 0xee, 0x01, 0xc3, 0x55, 0x0e, 0x7f, 0x88, 0x69, 0x88,
+	0x3a, 0x70, 0x94, 0x0e, 0x88, 0xc6, 0xf6, 0xd6, 0xad, 0xc2, 0xa5, 0x87, 0x39, 0x71, 0x9b, 0xba,
+	0xca, 0x4b, 0x10, 0xa7, 0xd8, 0xf9, 0x8a, 0x5d, 0xa2, 0x87, 0x4b, 0x8a, 0x2e, 0xa1, 0xb9, 0x4e,
+	0x4b, 0xbb, 0x70, 0xeb, 0x62, 0x86, 0x19, 0x38, 0x20, 0xe8, 0x0c, 0x04, 0x07, 0x27, 0xc4, 0xa5,
+	0xd1, 0xd3, 0xee, 0x72, 0xd3, 0x9a, 0xb5, 0xf9, 0x48, 0xa2, 0xd8, 0xa3, 0x61, 0x76, 0x5e, 0x5e,
+	0xca, 0x3f, 0x4a, 0x50, 0x9d, 0xb2, 0xc7, 0xf1, 0xaf, 0x07, 0x73, 0x03, 0x82, 0x4f, 0x1d, 0x9c,
+	0x78, 0x59, 0x4b, 0x07, 0xfd, 0xd3, 0xe2, 0x64, 0xd9, 0xbe, 0xee, 0x38, 0x13, 0x98, 0x5b, 0xa9,
+	0x7c, 0x0d, 0x42, 0x8e, 0xa2, 0x43, 0x10, 0x8d, 0x89, 0x3d, 0x9e, 0xa8, 0x8a, 0xa5, 0x4f, 0x0c,
+	0x69, 0x0f, 0x01, 0xd4, 0x74, 0x63, 0xa6, 0x0f, 0x35, 0xa9, 0x84, 0x44, 0xa8, 0x4f, 0xe6, 0x16,
+	0x2f, 0xca, 0x72, 0x1f, 0xc0, 0x24, 0xf1, 0xc6, 0x4f, 0x78, 0x9c, 0x57, 0x85, 0x38, 0x62, 0x5f,
+	0xfa, 0xf3, 0xd8, 0x34, 0xa0, 0x7c, 0x0e, 0xf5, 0xec, 0x3d, 0xb0, 0xfc, 0xec, 0xcd, 0xe4, 0xf9,
+	0xd9, 0x5a, 0x7e, 0x07, 0x30, 0x65, 0xdf, 0xd1, 0xe0, 0x29, 0x21, 0x31, 0x7a, 0x0d, 0x52, 0x4c,
+	0x22, 0x0f, 0xfb, 0xde, 0x37, 0xf2, 0x60, 0xf3, 0x0f, 0x8c, 0xab, 0x9b, 0xe6, 0xe1, 0x0e, 0xe7,
+	0xfa, 0xce, 0xcf, 0x12, 0x34, 0xf4, 0x00, 0xbb, 0xc4, 0x7a, 0x5a, 0xb3, 0x47, 0xf2, 0xbf, 0x7e,
+	0xa7, 0xdc, 0x6a, 0xb6, 0xb5, 0x98, 0x6a, 0xf6, 0xdc, 0x18, 0x6a, 0x23, 0xdd, 0xd0, 0x86, 0xd2,
+	0x1e, 0x12, 0xa0, 0x3a, 0x50, 0x66, 0xac, 0x95, 0x3a, 0x54, 0x86, 0xda, 0xbd, 0x54, 0x66, 0x90,
+	0xa5, 0xcd, 0x2c, 0xa9, 0xc2, 0xba, 0x63, 0xa4, 0x7d, 0x7f, 0x27, 0x55, 0x59, 0xc1, 0x60, 0x56,
+	0xec, 0xa3, 0x26, 0x08, 0xa6, 0xa6, 0x4e, 0xee, 0x35, 0x73, 0x21, 0xd5, 0x18, 0x35, 0x52, 0x54,
+	0x6b, 0x62, 0x2e, 0xa4, 0x3a, 0xa3, 0x46, 0xba, 0x79, 0xf7, 0x51, 0x31, 0x35, 0x49, 0x40, 0x47,
+	0xf0, 0x9f, 0x6a, 0xde, 0x5c, 0xd9, 0x5b, 0xa8, 0xd1, 0x09, 0xa0, 0xae, 0xae, 0x70, 0x18, 0x12,
+	0x1f, 0x9d, 0xc0, 0xb1, 0xfa, 0x5e, 0x31, 0x0c, 0x6d, 0x6c, 0xcf, 0x8d, 0xd9, 0x54, 0x53, 0xf5,
+	0x91, 0xce, 0x63, 0x21, 0x38, 0xc8, 0x89, 0x99, 0xa5, 0x0c, 0xc6, 0x2c, 0xa0, 0x04, 0xcd, 0x1c,
+	0x1b, 0x68, 0x96, 0x22, 0x95, 0xd9, 0xd5, 0xe4, 0x08, 0x8b, 0x5e, 0x29, 0x6e, 0x53, 0x15, 0x43,
+	0x31, 0x17, 0x52, 0x75, 0xf0, 0xf6, 0xd3, 0xb5, 0x4b, 0xb7, 0xd3, 0xef, 0xd2, 0xc8, 0xed, 0x15,
+	0xfe, 0xac, 0xbc, 0x70, 0x19, 0xe1, 0x1e, 0x1f, 0x65, 0xcf, 0xa5, 0x05, 0xe6, 0x73, 0x8d, 0x83,
+	0x6f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x91, 0x38, 0x60, 0x72, 0xdb, 0x04, 0x00, 0x00,
 }
diff --git a/src/chromite/api/test.proto b/src/chromite/api/test.proto
index a9f7cd2..16e4243 100644
--- a/src/chromite/api/test.proto
+++ b/src/chromite/api/test.proto
@@ -144,8 +144,8 @@
   // using cros chrome-sdk.
   string chrome_root = 2;
 
-  // If true, use goma when building Chrome.
-  bool use_goma = 3;
+  // Options for using goma when building Chrome.
+  chromiumos.GomaConfig goma_config = 3;
 }
 
 message SimpleChromeWorkflowTestResponse {
diff --git a/src/chromiumos/common.proto b/src/chromiumos/common.proto
index 0c8b4d6..8c83488 100644
--- a/src/chromiumos/common.proto
+++ b/src/chromiumos/common.proto
@@ -48,6 +48,9 @@
   string goma_dir = 1;
   // The goma client credentials file.
   string goma_client_json = 2;
+  // Path to the Goma client used for build package.
+  // If None, goma_dir will be used instead.
+  string chromeos_goma_dir = 3;
 }
 
 // Message describing a package, The corresponding variable names are from