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 cc372c5b1d.

Revert "Add no_apex check for static library"
This reverts commit 2db7f46d0c.

Revert "Add no_apex property"
This reverts commit 4f7dd9b4db.

Bug: 139870423
Bug: 128708192
Test: m

Change-Id: Ia4b094e371e9f8adff94ae6dc3ebb8e081381d4e
This commit is contained in:
Jiyong Park
2019-09-30 19:13:12 +09:00
parent 127b40b316
commit 7916bfc3cc
4 changed files with 4 additions and 234 deletions

View File

@@ -552,8 +552,10 @@ func (c *Module) Init() android.Module {
}
})
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 @@ func DefaultsFactory(props ...interface{}) android.Module {
&android.ProtoProperties{},
)
android.InitApexModule(module)
android.InitDefaultsModule(module)
android.InitApexModule(module)
return module
}