StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 71f093e485 6eb9a491ea
commit 6b8f282d98
6 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/app.go
View File

@@ -977,11 +977,8 @@ func AndroidAppFactory() android.Module {
module.Module.properties.Instrument = true
module.Module.properties.Installable = proptools.BoolPtr(true)
module.addHostAndDeviceProperties()
module.AddProperties(
&module.Module.properties,
&module.Module.deviceProperties,
&module.Module.dexpreoptProperties,
&module.Module.protoProperties,
&module.aaptProperties,
&module.appProperties,
&module.overridableAppProperties,
@@ -1097,11 +1094,8 @@ func AndroidTestFactory() android.Module {
module.appProperties.AlwaysPackageNativeLibs = true
module.Module.dexpreopter.isTest = true
module.addHostAndDeviceProperties()
module.AddProperties(
&module.Module.properties,
&module.Module.deviceProperties,
&module.Module.dexpreoptProperties,
&module.Module.protoProperties,
&module.aaptProperties,
&module.appProperties,
&module.appTestProperties,
@@ -1149,11 +1143,8 @@ func AndroidTestHelperAppFactory() android.Module {
module.appProperties.AlwaysPackageNativeLibs = true
module.Module.dexpreopter.isTest = true
module.addHostAndDeviceProperties()
module.AddProperties(
&module.Module.properties,
&module.Module.deviceProperties,
&module.Module.dexpreoptProperties,
&module.Module.protoProperties,
&module.aaptProperties,
&module.appProperties,
&module.appTestHelperAppProperties,