Merge changes Ibf4d57ce,I65b49c96

* changes:
  Exit early on genrule command parsing failure
  Add frameworks/* to root Android.bp
This commit is contained in:
Treehugger Robot
2017-04-20 00:15:51 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 5 deletions

View File

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

View File

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