From 6424d17a2d1c22729f50c7c053eef7c47175df17 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 8 Mar 2018 13:27:59 -0800
Subject: [PATCH] Allow proto properties in cc/java_defaults

Test: Add proto.canonical_path_from_root: true in a cc_defaults
Test: Add proto.canonical_path_from_root: true in a java_defaults
Change-Id: I9ddfc8af0025705a34b6e487225f1f98915054c3
---
 cc/cc.go     | 1 +
 java/java.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cc/cc.go b/cc/cc.go
index ebc98acfd..4d26e84de 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1423,6 +1423,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
 		&VndkProperties{},
 		&LTOProperties{},
 		&PgoProperties{},
+		&android.ProtoProperties{},
 	)
 
 	android.InitDefaultsModule(module)
diff --git a/java/java.go b/java/java.go
index c4c07f7c9..92170e680 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1280,6 +1280,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
 	module.AddProperties(
 		&CompilerProperties{},
 		&CompilerDeviceProperties{},
+		&android.ProtoProperties{},
 	)
 
 	android.InitDefaultsModule(module)