Merge changes I3ad2a356,I30955b6e,I1dc6fd99
* changes:
Add more androidmk translations for android libraries
Merge matching properties in bpfix
Make bpfix not modify the input tree
diff --git a/java/genrule.go b/java/genrule.go
index 80b7030..8f29482 100644
--- a/java/genrule.go
+++ b/java/genrule.go
@@ -21,6 +21,7 @@
func init() {
android.RegisterModuleType("java_genrule", genRuleFactory)
+ android.RegisterModuleType("java_genrule_host", genRuleFactoryHost)
}
// java_genrule is a genrule that can depend on other java_* objects.
@@ -33,3 +34,14 @@
return module
}
+
+// java_genrule_host is a genrule that can depend on other java_* objects.
+// The cmd may be run multiple times, once for each of the different host/device
+// variations.
+func genRuleFactoryHost() android.Module {
+ module := genrule.NewGenRule()
+
+ android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon)
+
+ return module
+}