Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6424d17a authored Mar 08, 2018 by Dan Willemsen

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

parent f7463f8d

cc/cc.go

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1423,6 +1423,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
	&VndkProperties{},		&VndkProperties{},
	&LTOProperties{},		&LTOProperties{},
	&PgoProperties{},		&PgoProperties{},
			&android.ProtoProperties{},
	)		)

	android.InitDefaultsModule(module)		android.InitDefaultsModule(module)

java/java.go

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1280,6 +1280,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
	module.AddProperties(		module.AddProperties(
	&CompilerProperties{},		&CompilerProperties{},
	&CompilerDeviceProperties{},		&CompilerDeviceProperties{},
			&android.ProtoProperties{},
	)		)

	android.InitDefaultsModule(module)		android.InitDefaultsModule(module)