From 0feb169460443bc6e342992a7aae47e54b8b6904 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 3 Nov 2016 14:38:52 -0700
Subject: [PATCH] Add proto property struct

The ProtoProperties struct was not being added to the property struct
list, preventing proto.type and proto.static properties from being set
in Android.bp files.

Bug: 32286026
Test: Add proto.type to system/extras/perfprofd/Android.bp, run soong
Change-Id: I9a5b63ddd3e7a53881ddbfd381c42aa1b4c4f454
---
 cc/compiler.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cc/compiler.go b/cc/compiler.go
index a14f39773..7e79dfa0a 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -115,7 +115,7 @@ func (compiler *baseCompiler) appendAsflags(flags []string) {
 }
 
 func (compiler *baseCompiler) compilerProps() []interface{} {
-	return []interface{}{&compiler.Properties}
+	return []interface{}{&compiler.Properties, &compiler.Proto}
 }
 
 func (compiler *baseCompiler) compilerInit(ctx BaseModuleContext) {}