aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-03-08 13:27:59 -0800
committerAndreas Gampe <agampe@google.com>2018-03-22 20:51:04 -0700
commitb785b616218f11a6863ae9917076f8464aa7125e (patch)
tree1350b0deff6e6185b44e144ee5e8849fafbf144a /cc
parent3cc0480d166ec17b1d3d6750d5adf61fa64ab186 (diff)
downloadbuild_soong-b785b616218f11a6863ae9917076f8464aa7125e.tar.gz
build_soong-b785b616218f11a6863ae9917076f8464aa7125e.tar.bz2
build_soong-b785b616218f11a6863ae9917076f8464aa7125e.zip
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
Diffstat (limited to 'cc')
-rw-r--r--cc/cc.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cc/cc.go b/cc/cc.go
index ebc98acf..4d26e84d 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)