Merge "Introduce module type 'sdk'"

This commit is contained in:
Treehugger Robot
2019-09-23 04:38:24 +00:00
committed by Gerrit Code Review
11 changed files with 698 additions and 13 deletions

View File

@@ -290,6 +290,7 @@ type Module struct {
android.ModuleBase
android.DefaultableModuleBase
android.ApexModuleBase
android.SdkBase
properties CompilerProperties
protoProperties android.ProtoProperties
@@ -1633,6 +1634,7 @@ func LibraryFactory() android.Module {
InitJavaModule(module, android.HostAndDeviceSupported)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
return module
}
@@ -1913,6 +1915,7 @@ type Import struct {
android.DefaultableModuleBase
android.ApexModuleBase
prebuilt android.Prebuilt
android.SdkBase
properties ImportProperties
@@ -2069,6 +2072,7 @@ func ImportFactory() android.Module {
android.InitPrebuiltModule(module, &module.properties.Jars)
InitJavaModule(module, android.HostAndDeviceSupported)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
return module
}