Merge changes Ibf4d57ce,I65b49c96

* changes:
  Exit early on genrule command parsing failure
  Add frameworks/* to root Android.bp

genrule/genrule.go

@@ -198,6 +198,7 @@ func (g *generator) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 
 	if err != nil {
 		ctx.PropertyErrorf("cmd", "%s", err.Error())
+		return
 	}
 
 	ruleParams := blueprint.RuleParams{

root.bp

@@ -17,13 +17,9 @@ optional_subdirs = [
     "development/*",
     "device/*/*",
     "external/*",
-    "frameworks/av",
-    "frameworks/base",
+    "frameworks/*",
     "frameworks/compile/*",
     "frameworks/hardware/interfaces",
-    "frameworks/native",
-    "frameworks/rs",
-    "frameworks/wilhelm",
     "hardware/*",
     "libcore",
     "libnativehelper",