make ApexProperties defaultable
ApexPropreties are added in InitApexModule() and they are supposed to be
defaultable. To be defaultable, InitApexModule() should be called before
InitDefaultableModule().
Bug: 144332048
Test: m (soong test added)
Change-Id: I6c90ed3b66a086292a4c0ecb37c61f83769e62bd
diff --git a/cc/cc.go b/cc/cc.go
index 840fe24..40e0fca 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -719,11 +719,9 @@
}
})
android.InitAndroidArchModule(c, c.hod, c.multilib)
-
- android.InitDefaultableModule(c)
-
android.InitApexModule(c)
android.InitSdkAwareModule(c)
+ android.InitDefaultableModule(c)
return c
}
@@ -2469,10 +2467,10 @@
&PgoProperties{},
&XomProperties{},
&android.ProtoProperties{},
+ &android.ApexProperties{},
)
android.InitDefaultsModule(module)
- android.InitApexModule(module)
return module
}