commit b785b616218f11a6863ae9917076f8464aa7125e
author Dan Willemsen <dwillemsen@google.com> Thu Mar 08 13:27:59 2018 -0800
committer Andreas Gampe <agampe@google.com> Thu Mar 22 20:51:04 2018 -0700
tree 1350b0deff6e6185b44e144ee5e8849fafbf144a
parent 3cc0480d166ec17b1d3d6750d5adf61fa64ab186

Allow proto properties in cc/java_defaults

(cherry picked from commit 6424d17a2d1c22729f50c7c053eef7c47175df17)

Bug: 73175642
Test: Add proto.canonical_path_from_root: true in a cc_defaults
Test: Add proto.canonical_path_from_root: true in a java_defaults
Merged-In: I9ddfc8af0025705a34b6e487225f1f98915054c3
Change-Id: I9ddfc8af0025705a34b6e487225f1f98915054c3

java/java.go

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