Refactor factories
Change module factories from returning a blueprint.Module and a list
of property structs to returning an android.Module, which holds the
list of property structs.
Test: build.ninja identical except for Factory: comment lines
Change-Id: Ica1d823f009db812c518f271a386fbff39c9766f
diff --git a/java/app.go b/java/app.go
index f6ccd34..2f2b899 100644
--- a/java/app.go
+++ b/java/app.go
@@ -274,13 +274,16 @@
return aaptFlags, aaptDeps, hasResources
}
-func AndroidAppFactory() (blueprint.Module, []interface{}) {
+func AndroidAppFactory() android.Module {
module := &AndroidApp{}
module.deviceProperties.Dex = true
- return android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon,
+ module.AddProperties(
&module.Module.properties,
&module.Module.deviceProperties,
&module.appProperties)
+
+ android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+ return module
}