commit 6424d17a2d1c22729f50c7c053eef7c47175df17
author Dan Willemsen <dwillemsen@google.com> Thu Mar 08 13:27:59 2018 -0800
committer Dan Willemsen <dwillemsen@google.com> Thu Mar 08 13:34:34 2018 -0800
tree f7f75ee57aeee359c39f5b5dd0595f93cae30cd7
parent f7463f8dd23c136ad24fbd26f8ae00fe3646567f

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

diff --git a/cc/cc.go b/cc/cc.go
index ebc98ac..4d26e84 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1423,6 +1423,7 @@
 		&VndkProperties{},
 		&LTOProperties{},
 		&PgoProperties{},
+		&android.ProtoProperties{},
 	)
 
 	android.InitDefaultsModule(module)

java/java.go

diff --git a/java/java.go b/java/java.go
index c4c07f7..92170e6 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1280,6 +1280,7 @@
 	module.AddProperties(
 		&CompilerProperties{},
 		&CompilerDeviceProperties{},
+		&android.ProtoProperties{},
 	)
 
 	android.InitDefaultsModule(module)