Merge changes Ia17b2bcb,Ic71892c3,Id2b23b9e,I435ee7aa,I85112506, ... am: 72ea641dff

am: 98a6f300fa

Change-Id: I84683c2204afb5792ec11e2c608dca288e9431ec
This commit is contained in:
Colin Cross
2019-06-12 13:52:07 -07:00
committed by android-build-merger
23 changed files with 495 additions and 346 deletions

View File

@@ -1808,9 +1808,6 @@ type DocDefaults struct {
android.DefaultsModuleBase
}
func (*DocDefaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func DocDefaultsFactory() android.Module {
module := &DocDefaults{}

View File

@@ -2131,9 +2131,6 @@ type Defaults struct {
android.DefaultsModuleBase
}
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
// java_defaults provides a set of properties that can be inherited by other java or android modules.
//
// A module can use the properties from a java_defaults module using `defaults: ["defaults_module_name"]`. Each