Merge "Consolidate adding common java properties" am: d7ffbb578d am: 6eb9a491ea

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1337094

Change-Id: I680fe974df8e68207c8bbb2bc0fce24635d4bdc8
This commit is contained in:
Treehugger Robot
2020-06-17 22:21:58 +00:00
committed by Automerger Merge Worker
6 changed files with 37 additions and 64 deletions

View File

@@ -1553,13 +1553,8 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont
}
func (module *SdkLibrary) InitSdkLibraryProperties() {
module.AddProperties(
&module.sdkLibraryProperties,
&module.properties,
&module.dexpreoptProperties,
&module.deviceProperties,
&module.protoProperties,
)
module.addHostAndDeviceProperties()
module.AddProperties(&module.sdkLibraryProperties)
module.initSdkLibraryComponent(&module.ModuleBase)