Merge "dumpstate: declare dependencies on external tools."

am: b46d97b94e

Change-Id: I752512df3e9d9643ae0b63a4093bb208a03a1bab

diff --cc cmds/dumpstate/Android.bp
index b04543b,91109d9..c852df1
--- 1/cmds/dumpstate/Android.bp
--- 2/cmds/dumpstate/Android.bp
+++ b/cmds/dumpstate/Android.bp
@@@ -83,23 -82,37 +83,49 @@@ cc_defaults 
          "libutils",
      ],
      srcs: [
 -        "DumpstateInternal.cpp",
 +        "DumpstateSectionReporter.cpp",
          "DumpstateService.cpp",
          "utils.cpp",
 +    ],
 +    static_libs: [
 +        "libdumpsys",
 +        "libserviceutils"
 +    ],
 +}
 +
 +cc_binary {
 +    name: "dumpstate",
 +    defaults: ["dumpstate_defaults"],
 +    srcs: [
          "dumpstate.cpp",
 +        "main.cpp",
      ],
+     required: [
+         "atrace",
+         "df",
+         "getprop",
+         "ip",
+         "iptables",
+         "ip6tables",
+         "kill",
+         "librank",
+         "logcat",
+         "logcompressor",
+         "lsmod",
+         "lsof",
+         "netstat",
+         "parse_radio_log",
+         "printenv",
+         "procrank",
+         "screencap",
+         "showmap",
+         "ss",
+         "storaged",
+         "top",
+         "uptime",
+         "vdc",
+         "vril-dump",
+     ],
      init_rc: ["dumpstate.rc"],
  }