Update art to use hooks instead of customizer
Change-Id: I46de5ea6ffbc0e32a0b306b8fe82b66b986e33cd
diff --git a/build/codegen.go b/build/codegen.go
index fde9420..d98ca4f 100644
--- a/build/codegen.go
+++ b/build/codegen.go
@@ -24,9 +24,7 @@
"strings"
)
-func (a *codegenCustomizer) CustomizeProperties(ctx android.CustomizePropertiesContext) {
- c := &a.codegenProperties.Codegen
-
+func codegen(ctx android.LoadHookContext, c *codegenProperties) {
var hostArches, deviceArches []string
e := envDefault(ctx, "ART_HOST_CODEGEN_ARCHS", "")
@@ -53,17 +51,17 @@
addCodegenArchProperties := func(p *props, hod **codegenArchProperties, arch string) {
switch arch {
case "arm":
- *hod = &c.Arm
+ *hod = &c.Codegen.Arm
case "arm64":
- *hod = &c.Arm64
+ *hod = &c.Codegen.Arm64
case "mips":
- *hod = &c.Mips
+ *hod = &c.Codegen.Mips
case "mips64":
- *hod = &c.Mips64
+ *hod = &c.Codegen.Mips64
case "x86":
- *hod = &c.X86
+ *hod = &c.Codegen.X86
case "x86_64":
- *hod = &c.X86_64
+ *hod = &c.Codegen.X86_64
default:
ctx.ModuleErrorf("Unknown codegen architecture %q", arch)
return
@@ -109,7 +107,7 @@
codegenProperties codegenProperties
}
-func defaultDeviceCodegenArches(ctx android.CustomizePropertiesContext) []string {
+func defaultDeviceCodegenArches(ctx android.LoadHookContext) []string {
arches := make(map[string]bool)
for _, a := range ctx.DeviceConfig().Arches() {
s := a.ArchType.String()