Merge "Support required property" am: 389d2bb145

am: 37f1c3dd70

Change-Id: I7b306c7836cf1f15e07c62d3c6e74db0a7dae68e

android/androidmk.go

@@ -200,6 +200,10 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
 	fmt.Fprintln(w, "LOCAL_MULTILIB :=", amod.commonProperties.Compile_multilib)
 	fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", data.OutputFile.String())
 
+	if len(amod.commonProperties.Required) > 0 {
+		fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES := "+strings.Join(amod.commonProperties.Required, " "))
+	}
+
 	archStr := amod.Arch().ArchType.String()
 	host := false
 	switch amod.Os().Class {

android/module.go

@@ -120,6 +120,9 @@ type commonProperties struct {
 	// init.rc files to be installed if this module is installed
 	Init_rc []string
 
+	// names of other modules to install if this module is installed
+	Required []string
+
 	// Set by TargetMutator
 	CompileTarget Target `blueprint:"mutated"`
 

cc/cc.go

@@ -124,7 +124,6 @@ type BaseProperties struct {
 
 type UnusedProperties struct {
 	Native_coverage *bool
-	Required        []string
 	Tags            []string
 }