Remove no_apex in favor or apex_available
This change reverts following three changes to remove the no_apex
property. no_apex: true is equivalent to apex_available:
["//apex_available:platform"].
Revert "fix: "no_apex" can be put in defaults"
This reverts commit cc372c5b1d998dfa632fdd459730542bd75643d0.
Revert "Add no_apex check for static library"
This reverts commit 2db7f46d0c40ed0fa28f005f16cbead70e3cd4e1.
Revert "Add no_apex property"
This reverts commit 4f7dd9b4db0628a4a475d49b8ffe2006d30b5bbf.
Bug: 139870423
Bug: 128708192
Test: m
Change-Id: Ia4b094e371e9f8adff94ae6dc3ebb8e081381d4e
diff --git a/cc/cc.go b/cc/cc.go
index 744e0cb..5763d0c 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -552,8 +552,10 @@
}
})
android.InitAndroidArchModule(c, c.hod, c.multilib)
- android.InitApexModule(c)
+
android.InitDefaultableModule(c)
+
+ android.InitApexModule(c)
android.InitSdkAwareModule(c)
return c
@@ -2227,8 +2229,8 @@
&android.ProtoProperties{},
)
- android.InitApexModule(module)
android.InitDefaultsModule(module)
+ android.InitApexModule(module)
return module
}