Merge changes from topic \\'soong_init_rc\\' am: f0cfc7b9e4

am: 763ebb5ac0

Change-Id: I6e844c661e8e8c452ffaad0532c5a25f5223ab55

android/androidmk.go

@@ -215,6 +215,9 @@ func translateAndroidMkModule(ctx blueprint.SingletonContext, w io.Writer, mod b
 		if len(amod.commonProperties.Logtags) > 0 {
 			fmt.Fprintln(w, "LOCAL_LOGTAGS_FILES := ", strings.Join(amod.commonProperties.Logtags, " "))
 		}
+		if len(amod.commonProperties.Init_rc) > 0 {
+			fmt.Fprintln(w, "LOCAL_INIT_RC := ", strings.Join(amod.commonProperties.Init_rc, " "))
+		}
 	}
 
 	if host {

android/module.go

@@ -116,6 +116,9 @@ type commonProperties struct {
 	// file
 	Logtags []string
 
+	// init.rc files to be installed if this module is installed
+	Init_rc []string
+
 	// Set by TargetMutator
 	CompileTarget Target `blueprint:"mutated"`
 

androidmk/cmd/androidmk/android.go

@@ -51,6 +51,7 @@ var standardProperties = map[string]struct {
 	"LOCAL_LOGTAGS_FILES":                 {"logtags", bpparser.ListType},
 	"LOCAL_EXPORT_SHARED_LIBRARY_HEADERS": {"export_shared_lib_headers", bpparser.ListType},
 	"LOCAL_EXPORT_STATIC_LIBRARY_HEADERS": {"export_static_lib_headers", bpparser.ListType},
+	"LOCAL_INIT_RC":                       {"init_rc", bpparser.ListType},
 
 	"LOCAL_JAVA_RESOURCE_DIRS":    {"java_resource_dirs", bpparser.ListType},
 	"LOCAL_JAVACFLAGS":            {"javacflags", bpparser.ListType},

root.bp

@@ -12,7 +12,7 @@ optional_subdirs = [
     "dalvik",
     "external/*",
     "frameworks/base",
-    "frameworks/native/libs/*",
+    "frameworks/native",
     "hardware/*",
     "libcore",
     "libnativehelper",