Allow proto properties in cc/java_defaults
(cherry picked from commit 6424d17a2d
)
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
This commit is contained in:
committed by
Andreas Gampe
parent
3cc0480d16
commit
b785b61621
1
cc/cc.go
1
cc/cc.go
@@ -1423,6 +1423,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
|
|||||||
&VndkProperties{},
|
&VndkProperties{},
|
||||||
<OProperties{},
|
<OProperties{},
|
||||||
&PgoProperties{},
|
&PgoProperties{},
|
||||||
|
&android.ProtoProperties{},
|
||||||
)
|
)
|
||||||
|
|
||||||
android.InitDefaultsModule(module)
|
android.InitDefaultsModule(module)
|
||||||
|
@@ -1277,6 +1277,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
|
|||||||
module.AddProperties(
|
module.AddProperties(
|
||||||
&CompilerProperties{},
|
&CompilerProperties{},
|
||||||
&CompilerDeviceProperties{},
|
&CompilerDeviceProperties{},
|
||||||
|
&android.ProtoProperties{},
|
||||||
)
|
)
|
||||||
|
|
||||||
android.InitDefaultsModule(module)
|
android.InitDefaultsModule(module)
|
||||||
|
Reference in New Issue
Block a user