diff options
Diffstat (limited to 'apex/key.go')
| -rw-r--r-- | apex/key.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/apex/key.go b/apex/key.go index ec33763dd..d2d5786b3 100644 --- a/apex/key.go +++ b/apex/key.go @@ -27,7 +27,7 @@ import ( var String = proptools.String func init() { - android.RegisterModuleType("apex_key", apexKeyFactory) + android.RegisterModuleType("apex_key", ApexKeyFactory) android.RegisterSingletonType("apex_keys_text", apexKeysTextFactory) } @@ -53,11 +53,10 @@ type apexKeyProperties struct { Installable *bool } -func apexKeyFactory() android.Module { +func ApexKeyFactory() android.Module { module := &apexKey{} module.AddProperties(&module.properties) - // This module is device-only - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitAndroidArchModule(module, android.HostAndDeviceDefault, android.MultilibCommon) return module } @@ -117,11 +116,11 @@ func (s *apexKeysText) GenerateBuildActions(ctx android.SingletonContext) { partition string } toString := func(e apexKeyEntry) string { - format := "name=%q public_key=%q private_key=%q container_certificate=%q container_private_key=%q\\n" + format := "name=%q public_key=%q private_key=%q container_certificate=%q container_private_key=%q partition=%q\\n" if e.presigned { - return fmt.Sprintf(format, e.name, "PRESIGNED", "PRESIGNED", "PRESIGNED", "PRESIGNED") + return fmt.Sprintf(format, e.name, "PRESIGNED", "PRESIGNED", "PRESIGNED", "PRESIGNED", e.partition) } else { - return fmt.Sprintf(format, e.name, e.public_key, e.private_key, e.container_certificate, e.container_private_key) + return fmt.Sprintf(format, e.name, e.public_key, e.private_key, e.container_certificate, e.container_private_key, e.partition) } } |