From 2277bcbc2aa92aeb9b752dd1327022829bfa9e24 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 25 Jul 2016 20:27:39 -0700
Subject: [PATCH 1/2] Add init_rc property, equivalent to LOCAL_INIT_RC

Change-Id: I914bfff8cbdf71b6cfb2271199a964b2cdcb72d0
---
 android/androidmk.go               | 3 +++
 android/module.go                  | 3 +++
 androidmk/cmd/androidmk/android.go | 1 +
 3 files changed, 7 insertions(+)

diff --git a/android/androidmk.go b/android/androidmk.go
index 232a599b7..1e261a049 100644
--- a/android/androidmk.go
+++ b/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 {
diff --git a/android/module.go b/android/module.go
index 216aefe9d..41499ca7d 100644
--- a/android/module.go
+++ b/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"`
 
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 2d9a5ce59..3bda7a954 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/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},

From c947526c6901050e70d0baf7f193bff024520df5 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 25 Jul 2016 17:44:03 -0700
Subject: [PATCH 2/2] Include frameworks/native

Change-Id: Ic20d27727a48b397089a7eca43a701e3e56567ba
---
 root.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root.bp b/root.bp
index 0a8c0c3a7..4b03cf14f 100644
--- a/root.bp
+++ b/root.bp
@@ -12,7 +12,7 @@ optional_subdirs = [
     "dalvik",
     "external/*",
     "frameworks/base",
-    "frameworks/native/libs/*",
+    "frameworks/native",
     "hardware/*",
     "libcore",
     "libnativehelper",