Merge changes Ia17b2bcb,Ic71892c3,Id2b23b9e,I435ee7aa,I85112506, ... am: 72ea641dff am: 98a6f300fa am: 31de2eaf51

am: 96f886c906 Change-Id: I50756a32209fec2706e9115bfa7d28ac05af3185
2019-06-12 15:13:08 -07:00
parent 3313b8fc5f 96f886c906
commit 771800ca82
23 changed files with 495 additions and 346 deletions
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2060,9 +2060,6 @@ type Defaults struct {
 	android.ApexModuleBase
 }

-func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
-}
-
 // cc_defaults provides a set of properties that can be inherited by other cc
 // modules. A module can use the properties from a cc_defaults using
 // `defaults: ["<:default_module_name>"]`. Properties of both modules are