From 76ef5abd9a609c10e067170aa06b73440b7216a9 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 13 Sep 2016 16:55:40 -0700 Subject: [PATCH 1/2] Fix lex/yacc path Test: It no longer panics when there is a .yy/.ll file to build Change-Id: I15c17d0df9449eabbede5d8afef955156baaba3d --- cc/gen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/gen.go b/cc/gen.go index c344cf642..b35eee5df 100644 --- a/cc/gen.go +++ b/cc/gen.go @@ -25,8 +25,8 @@ import ( ) func init() { - pctx.SourcePathVariable("lexCmd", "prebuilts/misc/${HostPrebuiltTag}/flex/flex-2.5.39") - pctx.SourcePathVariable("yaccCmd", "prebuilts/misc/${HostPrebuiltTag}/bison/bison") + pctx.SourcePathVariable("lexCmd", "prebuilts/misc/${config.HostPrebuiltTag}/flex/flex-2.5.39") + pctx.SourcePathVariable("yaccCmd", "prebuilts/misc/${config.HostPrebuiltTag}/bison/bison") pctx.SourcePathVariable("yaccDataDir", "external/bison/data") } From 2c173ee03ac18b14f7e48d19057ac983ba640916 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 13 Sep 2016 16:56:15 -0700 Subject: [PATCH 2/2] Add entries in root.bp for hidl/hwbinder Change-Id: I8dd0f8585dc8214c43983112bd6b8e109ac030af --- root.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/root.bp b/root.bp index 12ca16279..95f089b1a 100644 --- a/root.bp +++ b/root.bp @@ -24,6 +24,10 @@ optional_subdirs = [ "system/core/*", "system/extras/*", "system/keymaster", + "system/hwservicemanager", + "system/libhidl", + "system/libhwbinder", "system/media/*", "system/security/*", + "system/tools/*", ]