Merge "Add support for using cc_library in sdk/module_exports"

2020-03-21 09:50:28 +00:00
parent 1950f1d413 9b76c0b65a
commit 3dcf75d343
5 changed files with 198 additions and 8 deletions
--- a/cc/library.go
+++ b/cc/library.go
@@ -195,6 +195,7 @@ func LibraryFactory() android.Module {
 	module.sdkMemberTypes = []android.SdkMemberType{
 		sharedLibrarySdkMemberType,
 		staticLibrarySdkMemberType,
+		staticAndSharedLibrarySdkMemberType,
 	}
 	return module.Init()
 }