1 files changed, 11 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 7d7afe24..5219c5a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,20 +38,26 @@ cc_defaults {
   stl: "none",
 }
 
+cc_binary_host {
+  name: "strgen",
+  local_include_dirs: ["include"],
+  srcs: ["gen/strgen.c"],
+}
+
 genrule {
   name: "bc-lib.c",
   srcs: ["gen/lib.bc"],
   out: ["gen/lib.c"],
-  tool_files: ["gen/strgen.sh"],
-  cmd: "$(location gen/strgen.sh) $(in) $(out) bc_lib bc_lib_name BC_ENABLED",
+  tools: ["strgen"],
+  cmd: "$(location strgen) $(in) $(out) 0 bc_lib bc_lib_name BC_ENABLED 1",
 }
 
 genrule {
   name: "bc-bc_help.c",
   srcs: ["gen/bc_help.txt"],
   out: ["gen/bc_help.c"],
-  tool_files: ["gen/strgen.sh"],
-  cmd: "$(location gen/strgen.sh) $(in) $(out) bc_help '' BC_ENABLED",
+  tools: ["strgen"],
+  cmd: "$(location strgen) $(in) $(out) 0 bc_help '' BC_ENABLED",
 }
 
 genrule {
@@ -86,7 +92,7 @@ sh_test {
   host_supported: true,
   device_supported: false,
   data: [
-    "scripts/functions.sh",
+    "scripts/*.sh",
     "tests/**/*",
   ],
 }