fix: "no_apex" can be put in defaults
Currently, putting no_apex in defaults module doesn't work.
To fix this,
* 'no_apex' property is added as 'defaultable'.
* apex module doesn't follow beyond 'defaults' module.
Bug: 141560644
Test: m (soong tests added)
Change-Id: I8410785f7f83d843689a33b1241d74086c6a7671
diff --git a/cc/cc.go b/cc/cc.go
index e1d184a..2987369 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -544,10 +544,8 @@
}
})
android.InitAndroidArchModule(c, c.hod, c.multilib)
-
- android.InitDefaultableModule(c)
-
android.InitApexModule(c)
+ android.InitDefaultableModule(c)
android.InitSdkAwareModule(c)
return c
@@ -2221,8 +2219,8 @@
&android.ProtoProperties{},
)
- android.InitDefaultsModule(module)
android.InitApexModule(module)
+ android.InitDefaultsModule(module)
return module
}