Merge "Hide static from cc_library_shared and vice versa"

2019-10-02 21:39:37 +00:00
parent 2f429160c1 e1bb5d092a
commit 62be1e3e33
4 changed files with 142 additions and 54 deletions
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2208,6 +2208,8 @@ func DefaultsFactory(props ...interface{}) android.Module {
 		&BaseLinkerProperties{},
 		&ObjectLinkerProperties{},
 		&LibraryProperties{},
+		&StaticProperties{},
+		&SharedProperties{},
 		&FlagExporterProperties{},
 		&BinaryLinkerProperties{},
 		&TestProperties{},